diff options
| author | wbx <wbx@openadk.org> | 2011-04-29 18:09:11 +0200 |
|---|---|---|
| committer | wbx <wbx@openadk.org> | 2011-04-29 18:09:11 +0200 |
| commit | ed5d1f8b7bfb0015e22dbc95f01a253a81b81f36 (patch) | |
| tree | 0f0020fa0eb348a1bbbd044b7733c3e8e242e146 /mk | |
| parent | 7cc2a1778bdea47e6737ed6109fc88e32253a41b (diff) | |
| parent | fb5986b361eae7893a57e92ec0a4f820b89bc527 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 8 | ||||
| -rw-r--r-- | mk/kernel-vars.mk | 8 | ||||
| -rw-r--r-- | mk/vars.mk | 6 |
3 files changed, 12 insertions, 10 deletions
diff --git a/mk/build.mk b/mk/build.mk index 2a3bf2d34..da78089e2 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -123,9 +123,13 @@ world: ifeq ($(ADK_NATIVE),y) $(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare tools/install target/config-prepare target/compile package/compile root_clean package/install package_index target/install else +ifeq ($(ADK_TOOLCHAIN),y) ifeq ($(ADK_TOOLCHAIN_ONLY),y) $(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install package/compile else + $(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install package/compile root_clean package/install +endif +else $(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index endif endif @@ -214,7 +218,7 @@ clean: @$(TRACE) clean $(MAKE) -C $(CONFIG) clean for d in ${STAGING_PKG_DIR}; do \ - for f in $$(ls $$d/[a-z]*|grep -v [A-Z] 2>/dev/null); do \ + for f in $$(ls $$d/[a-z]* 2>/dev/null |grep -v [A-Z] 2>/dev/null); do \ while read file ; do \ rm ${STAGING_DIR}/$$file 2>/dev/null;\ done < $$f ; \ @@ -513,7 +517,7 @@ bulk: ( \ echo === building $$arch $$system $$libc on $$(date); \ $(GMAKE) prereq && \ - $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive defconfig; \ + $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=nfsroot defconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \ diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk index 346a26fc9..e726b14da 100644 --- a/mk/kernel-vars.mk +++ b/mk/kernel-vars.mk @@ -8,10 +8,14 @@ KERNEL_MAKE_OPTS+= CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ HOSTCFLAGS='${CFLAGS_FOR_BUILD}' endif ifeq (${ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G},y) -ADK_KCPPFLAGS+= -DBCM47XX_OVERRIDE_FLASHSIZE=0x400000 +ADK_KCPPFLAGS+= -DBCM47XX_OVERRIDE_FLASHSIZE=0x400000 \ + -DBCM47XX_OVERRIDE_NVRAMSIZE=0x10000 \ + -DBCM47XX_OVERRIDE_CFESIZE=0x40000 endif ifeq (${ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54GS},y) -ADK_KCPPFLAGS+= -DBCM47XX_OVERRIDE_FLASHSIZE=0x800000 +ADK_KCPPFLAGS+= -DBCM47XX_OVERRIDE_FLASHSIZE=0x800000 \ + -DBCM47XX_OVERRIDE_NVRAMSIZE=0x20000 \ + -DBCM47XX_OVERRIDE_CFESIZE=0x40000 endif KERNEL_MAKE_ENV+= KCPPFLAGS='${ADK_KCPPFLAGS}' diff --git a/mk/vars.mk b/mk/vars.mk index 7b9bbe462..a7c6e30b3 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -79,12 +79,6 @@ TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts TARGET_LDFLAGS:= endif -ifneq ($(ADK_STATIC),) -TARGET_CFLAGS+= -static -TARGET_CXXFLAGS+= -static -TARGET_LDFLAGS+= -static -endif - ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),) TARGET_CFLAGS+= -fstack-protector TARGET_CXXFLAGS+= -fstack-protector |