[Balloon-svn] r1214 - in balloon/branches/menuconfig/package…

Author: nick
Date: 2010-08-24 17:49:35 +0100 (Tue, 24 Aug 2010)
New Revision: 1214

Modified:
balloon/branches/menuconfig/package/u-boot/patches/balloon3.patch
balloon/branches/menuconfig/package/u-boot/u-boot.mk
Log:
update u-boot to use eabi compiler

Modified: balloon/branches/menuconfig/package/u-boot/patches/balloon3.patch
===================================================================
--- balloon/branches/menuconfig/package/u-boot/patches/balloon3.patch    2010-08-24 10:53:08 UTC (rev 1213)
+++ balloon/branches/menuconfig/package/u-boot/patches/balloon3.patch    2010-08-24 16:49:35 UTC (rev 1214)
@@ -7,28 +7,14 @@
  #

-CROSS_COMPILE ?= arm-linux-
-+CROSS_COMPILE ?= arm-linux-gnu-
++CROSS_COMPILE ?= arm-linux-gnueabi-

  ifeq ($(BOARD),omap2420h4)
  STANDALONE_LOAD_ADDR = 0x80300000
-Index: u-boot-pxa/arch/arm/cpu/pxa/config.mk
-===================================================================
---- u-boot-pxa.orig/arch/arm/cpu/pxa/config.mk    2010-08-24 10:27:24.000000000 +0100
-+++ u-boot-pxa/arch/arm/cpu/pxa/config.mk    2010-08-24 10:28:06.000000000 +0100
-@@ -22,7 +22,8 @@
- # MA 02111-1307 USA
- #
- 
--PLATFORM_RELFLAGS += -fno-common -ffixed-r8 -msoft-float
-+#PLATFORM_RELFLAGS += -fno-common -ffixed-r8 -msoft-float
-+PLATFORM_RELFLAGS += -fno-common -ffixed-r8 -mhard-float
- 
- PLATFORM_CPPFLAGS += -march=armv5te -mtune=xscale
- # =========================================================================
 Index: u-boot-pxa/include/configs/balloon3.h
 ===================================================================
 --- u-boot-pxa.orig/include/configs/balloon3.h    2010-08-24 10:37:48.000000000 +0100
-+++ u-boot-pxa/include/configs/balloon3.h    2010-08-24 10:39:27.000000000 +0100
++++ u-boot-pxa/include/configs/balloon3.h    2010-08-24 12:33:43.000000000 +0100
 @@ -47,7 +47,7 @@
          "bootm 0xa4000000; "                    \
      "fi; "                                \
@@ -38,18 +24,19 @@
  #define    CONFIG_TIMESTAMP
  #define    CONFIG_BOOTDELAY        2    /* Autoboot delay */
  #define    CONFIG_CMDLINE_TAG
-@@ -169,6 +169,14 @@
+@@ -169,6 +169,15 @@
  #define CONFIG_ENV_ADDR_REDUND    (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
  #define CONFIG_ENV_SIZE_REDUND    (CONFIG_ENV_SIZE)

 +// NCB
-+#define CONFIG_MTD_DEVICE
-+#define CONFIG_MTD_PARTITIONS
++//#define CONFIG_MTD_DEVICE
++//#define CONFIG_MTD_PARTITIONS
++//
++//#define CONFIG_CMD_MTDPARTS
++//#define MTDIDS_DEFAULT        "nor0=physmap-flash.0"
++//#define MTDPARTS_DEFAULT    "mtdparts=physmap-flash.0:2m(reserved)," \
++//    "4m(kernel),-(space)"
 +
-+#define CONFIG_CMD_MTDPARTS
-+#define MTDIDS_DEFAULT        "nor0=physmap-flash.0"
-+#define MTDPARTS_DEFAULT    "mtdparts=physmap-flash.0:2m(reserved)," \
-+    "4m(kernel),-(space)"
  #if 0
  /*
   * IDE

Modified: balloon/branches/menuconfig/package/u-boot/u-boot.mk
===================================================================
--- balloon/branches/menuconfig/package/u-boot/u-boot.mk    2010-08-24 10:53:08 UTC (rev 1213)
+++ balloon/branches/menuconfig/package/u-boot/u-boot.mk    2010-08-24 16:49:35 UTC (rev 1214)
@@ -29,13 +29,14 @@
     ($(MAKE) -C $(BUILD))

 u-boot: $(BUILD)/u-boot.bin
-    cp $(BUILD)/u-boot.bin $(RES)/u-boot.bin
-    cp $(RES)/u-boot.bin $(RES)/u-boot
+    cp -f $(BUILD)/u-boot.bin $(RES)/u-boot.bin
+    cp -f $(RES)/u-boot.bin $(RES)/u-boot
+    rm -f u-boot.gz
     gzip --best $(RES)/u-boot

 u-boot-clean:
-    ($(MAKE) $(MAKEOPTS) -C $(BUILD) clean) && 0
-    rm $(RES)/u-boot.bin $(RES)/u-boot.gz && 0
+    ($(MAKE) $(MAKEOPTS) -C $(BUILD) clean)
+    rm -f $(RES)/u-boot.bin $(RES)/u-boot.gz

.PHONY: u-boot u-boot-clean