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

Author: nick
Date: 2010-08-22 22:20:10 +0100 (Sun, 22 Aug 2010)
New Revision: 1204

Added:
balloon/branches/menuconfig/package/u-boot/
balloon/branches/menuconfig/package/u-boot/Config.in
balloon/branches/menuconfig/package/u-boot/u-boot.mk
Modified:
balloon/branches/menuconfig/package/Config.in
balloon/branches/menuconfig/package/bootldr/Config.in
balloon/branches/menuconfig/package/bootldr/bootldr.mk
Log:
add package support for u-boot - u-boot source tree omitted as very large

Modified: balloon/branches/menuconfig/package/Config.in
===================================================================
--- balloon/branches/menuconfig/package/Config.in    2010-08-22 21:16:22 UTC (rev 1203)
+++ balloon/branches/menuconfig/package/Config.in    2010-08-22 21:20:10 UTC (rev 1204)
@@ -1,4 +1,5 @@
 source package/bootldr/Config.in
+source package/u-boot/Config.in
 source package/vhdl/Config.in
 source package/initrd/Config.in
 source package/kernel/Config.in

Modified: balloon/branches/menuconfig/package/bootldr/Config.in
===================================================================
--- balloon/branches/menuconfig/package/bootldr/Config.in    2010-08-22 21:16:22 UTC (rev 1203)
+++ balloon/branches/menuconfig/package/bootldr/Config.in    2010-08-22 21:20:10 UTC (rev 1204)
@@ -16,3 +16,8 @@
         default "y"
         depends on BR2_PACKAGE_BOOTLDR

+config BR2_BOOTLDR_UBOOT
+        bool "Add uboot partition and execution support for U-Boot"
+        default "n"
+        depends on BR2_BOOTLDR_BALLOON3
+

Modified: balloon/branches/menuconfig/package/bootldr/bootldr.mk
===================================================================
--- balloon/branches/menuconfig/package/bootldr/bootldr.mk    2010-08-22 21:16:22 UTC (rev 1203)
+++ balloon/branches/menuconfig/package/bootldr/bootldr.mk    2010-08-22 21:20:10 UTC (rev 1204)
@@ -1,6 +1,9 @@
+ifeq ($(BR2_BOOTLDR_UBOOT),y)
+BOOTLDR_OPTS=CONFIG_BOOTLDR_UBOOT=y
+endif

 bootldr:
-    ($(MAKE) -C $(CHECKOUT)/bootldr all)
+    ( $(BOOTLDR_OPTS) $(MAKE) -C $(CHECKOUT)/bootldr all)

 bootldr-clean:
     ($(MAKE) $(MAKEOPTS) -C $(CHECKOUT)/bootldr clean)

Added: balloon/branches/menuconfig/package/u-boot/Config.in
===================================================================
--- balloon/branches/menuconfig/package/u-boot/Config.in                            (rev 0)
+++ balloon/branches/menuconfig/package/u-boot/Config.in    2010-08-22 21:20:10 UTC (rev 1204)
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_UBOOT
+    bool "U-Boot bootloader"
+    default "n"
+    help
+      This is the u-boot for the balloon3
+      It is an alternative to bootldr
+

Added: balloon/branches/menuconfig/package/u-boot/u-boot.mk
===================================================================
--- balloon/branches/menuconfig/package/u-boot/u-boot.mk                            (rev 0)
+++ balloon/branches/menuconfig/package/u-boot/u-boot.mk    2010-08-22 21:20:10 UTC (rev 1204)
@@ -0,0 +1,23 @@
+
+$(CHECKOUT)/u-boot-pxa/u-boot.bin:
+    ($(MAKE) -C $(CHECKOUT)/u-boot-pxa balloon3_config)
+    ($(MAKE) -C $(CHECKOUT)/u-boot-pxa)
+
+u-boot: $(CHECKOUT)/u-boot-pxa/u-boot.bin
+    if [ ! -d $(BUILDDIR)/u-boot ]; then \
+        mkdir -p $(BUILDDIR)/u-boot; \
+    fi;
+    ($(MAKE) $(MAKEOPTS) -C $(CHECKOUT)/u-boot-pxa)
+    cp $(CHECKOUT)/u-boot-pxa/u-boot.bin $(BUILDDIR)/u-boot/u-boot.bin
+    cp $(BUILDDIR)/u-boot/u-boot.bin $(BUILDDIR)/u-boot/u-boot
+    gzip --best $(BUILDDIR)/u-boot/u-boot
+
+u-boot-clean:
+    ($(MAKE) $(MAKEOPTS) -C $(CHECKOUT)/u-boot-pxa clean)
+    rm -rf $(BUILDDIR)/u-boot/*
+
+.PHONY: u-boot u-boot-clean
+
+ifeq ($(BR2_PACKAGE_UBOOT),y)
+TARGETS+=u-boot
+endif