diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-01-30 17:45:30 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-01-30 17:45:30 +0000 |
| commit | 8dc42b0a2e0923adfeedfdf24b050000b045910a (patch) | |
| tree | b01bb1693101731d40e3e1aca855dc118a1b13ea | |
| parent | d2fdd8bd46f4d07da061195152785aa7309abcf1 (diff) | |
- add some defaults for arm and set them later on depending on the .config
| -rw-r--r-- | toolchain/uClibc/uClibc-0.9.29.config | 17 | ||||
| -rw-r--r-- | toolchain/uClibc/uclibc.mk | 7 |
2 files changed, 19 insertions, 5 deletions
diff --git a/toolchain/uClibc/uClibc-0.9.29.config b/toolchain/uClibc/uClibc-0.9.29.config index 18f37fca8..f1f36ba1c 100644 --- a/toolchain/uClibc/uClibc-0.9.29.config +++ b/toolchain/uClibc/uClibc-0.9.29.config @@ -182,3 +182,20 @@ WARNINGS="-Wall" # EXTRA_WARNINGS is not set # DOMULTI is not set # UCLIBC_MJN3_ONLY is not set + +# USE_BX is not set +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +# CONFIG_ARM_IWMMXT is not set + diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 726a5e7ea..b6dea1920 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -64,7 +64,6 @@ UCLIBC_NOT_TARGET_ENDIAN:=LITTLE endif $(DL_DIR)/$(UCLIBC_SOURCE): - mkdir -p $(DL_DIR) $(WGET) -P $(DL_DIR) $(UCLIBC_SITE)/$(UCLIBC_SOURCE) ifneq ($(BR2_ENABLE_LOCALE),) @@ -72,7 +71,6 @@ UCLIBC_SITE_LOCALE:=http://www.uclibc.org/downloads UCLIBC_SOURCE_LOCALE:=uClibc-locale-030818.tgz $(DL_DIR)/$(UCLIBC_SOURCE_LOCALE): - mkdir -p $(DL_DIR) $(WGET) -P $(DL_DIR) $(UCLIBC_SITE_LOCALE)/$(UCLIBC_SOURCE_LOCALE) UCLIBC_LOCALE_DATA:=$(DL_DIR)/$(UCLIBC_SOURCE_LOCALE) @@ -82,7 +80,6 @@ endif uclibc-unpacked: $(UCLIBC_DIR)/.unpacked $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_LOCALE_DATA) - mkdir -p $(TOOL_BUILD_DIR) $(UCLIBC_CAT) $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(UCLIBC_DIR) toolchain/uClibc/ uClibc-$(UCLIBC_VER)-\*.patch ifneq ($(BR2_ENABLE_LOCALE),) @@ -103,9 +100,9 @@ $(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.unpacked $(UCLIBC_CONFIG_FILE) -e 's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \ $(UCLIBC_DIR)/.config ifeq ($(UCLIBC_TARGET_ARCH),arm) - $(SED) '/.*CONFIG_ARM.*/d' -e '/.*CONFIG_GENERIC_ARM.*/d' \ + $(SED) 's/^\(CONFIG_[^_]*[_]*ARM[^=]*\)=.*/# \1 is not set/g' \ $(UCLIBC_DIR)/.config - /bin/echo "CONFIG_$(shell echo $(BR2_ARM_TYPE))=y" >> \ + /bin/echo "CONFIG_$(BR2_ARM_TYPE)=y" >> \ $(UCLIBC_DIR)/.config ifeq ($(BR2_ARM_EABI),y) /bin/echo "# CONFIG_ARM_OABI is not set" >> $(UCLIBC_DIR)/.config |