diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/nand | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/nand')
| -rw-r--r-- | package/nand/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/package/nand/Makefile b/package/nand/Makefile index da66808b0..f6bfd0f96 100644 --- a/package/nand/Makefile +++ b/package/nand/Makefile @@ -6,8 +6,8 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nand PKG_VERSION:= 1.0 PKG_RELEASE:= 3 -PKG_DESCR:= NAND utility -PKG_SECTION:= fs +PKG_DESCR:= nand flash utility +PKG_SECTION:= sys/fs PKG_DFLT_NAND:= y if ADK_TARGET_WITH_NAND PKG_CFLINE_NAND:= depends on ADK_TARGET_WITH_NAND @@ -22,8 +22,6 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -TARGET_CFLAGS+= -Wall - do-build: ${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \ -o ${WRKBUILD}/nand ${WRKBUILD}/nand.c |