uClibc: fix ppc e500 handling

Closes #2449

Signed-off-by: Stanislav Bogatyrev <bogatyrev_stanislav@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index 86a2cc293b1d630a7a47c091cb4cc09d8a11ea93..c18edab9ac46f240d9194b06344408b79e05cc8d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -24,6 +24,7 @@
 
        #635:  util-linux fails to build in 2009.08
        #2239: netcat package installs its binary to target as avr32-linux...
+       #2449: Minor fixes for squashfs makefile and correct PowerPC e500 ...
 
 2010.08-rc1, Released July 30th, 2010:
 

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index b9ef5512a75ca722cac22c15447eef824e5a0814..4fb9393a9d700ef6703244412fe4622892e30024 100644 (file)
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -217,13 +217,7 @@ ifeq ($(UCLIBC_TARGET_ARCH),sparc)
        $(SED) 's/^.*$(UCLIBC_SPARC_TYPE)[^B].*/$(UCLIBC_SPARC_TYPE)=y/g' $(UCLIBC_DIR)/.oldconfig
 endif
 ifeq ($(UCLIBC_TARGET_ARCH),powerpc)
-ifeq ($(BR2_powerpc_8540),y)
-       TARGET_POWERPC_CORE_E500:=y
-endif
-ifeq ($(BR2_powerpc_e500mc),y)
-       TARGET_POWERPC_CORE_E500:=y
-endif
-ifeq ($(TARGET_POWERPC_CORE_E500),y)
+ifeq ($(BR2_powerpc_8540)$(BR2_powerpc_e500mc),y)
        /bin/echo "# CONFIG_CLASSIC is not set" >> $(UCLIBC_DIR)/.oldconfig
        /bin/echo "CONFIG_E500=y" >> $(UCLIBC_DIR)/.oldconfig
 else