[Armadeus-commitlog] SF.net SVN: armadeus:[981] trunk

[<jo...@us...>]

Revision: 981
          http://armadeus.svn.sourceforge.net/armadeus/?rev=981&view=rev
Author:   jorasse
Date:     2009-01-01 16:15:24 +0000 (Thu, 01 Jan 2009)

Log Message:
-----------
[buildroot] Enable save/restore project config - including u-boot, uclibc and busybox configuration

Modified Paths:
--------------
    trunk/buildroot/target/device/armadeus/Makefile.in
    trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
    trunk/buildroot/target/device/armadeus/u-boot/u-boot.mk
    trunk/patches/051-buildroot-u-boot.diff

Added Paths:
-----------
    trunk/patches/062-buildroot-add-uboot-conf-to-saved-project.diff

Modified: trunk/buildroot/target/device/armadeus/Makefile.in
===================================================================
--- trunk/buildroot/target/device/armadeus/Makefile.in	2008-12-29 15:11:09 UTC (rev 980)
+++ trunk/buildroot/target/device/armadeus/Makefile.in	2009-01-01 16:15:24 UTC (rev 981)
@@ -27,8 +27,11 @@
 include target/device/armadeus/rootfs/Makefile.in
 include target/device/armadeus/$(BOARD_NAME)/Makefile.in
 
+ifndef BR2_PACKAGE_BUSYBOX_CONFIG
 BR2_PACKAGE_BUSYBOX_CONFIG:=$(ARMADEUS_PATH)/busybox.config
-UCLIBC_CONFIG_FILE:=$(BOARD_PATH)/uClibc.config.$(ARCH)
+endif
 
+#UCLIBC_CONFIG_FILE:=$(BOARD_PATH)/uClibc.config.$(ARCH)
+
 endif
 

Modified: trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig	2008-12-29 15:11:09 UTC (rev 980)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig	2009-01-01 16:15:24 UTC (rev 981)
@@ -186,7 +186,7 @@
 # BR2_UCLIBC_VERSION_0_9_28_3 is not set
 BR2_UCLIBC_VERSION_0_9_29=y
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
-BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.29.config"
+BR2_UCLIBC_CONFIG="$(BOARD_PATH)/uClibc.config.$(ARCH)"
 # BR2_ENABLE_LOCALE is not set
 # BR2_PTHREADS_NONE is not set
 # BR2_PTHREADS is not set
@@ -729,7 +729,8 @@
 # bootloader for target device
 #
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
+BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_PATH)"
+BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME).h"
 BR2_TARGET_UBOOT_CUSTOM_PATCH=""
 BR2_TARGET_UBOOT_SERVERIP=""
 BR2_TARGET_UBOOT_IPADDR=""

Modified: trunk/buildroot/target/device/armadeus/u-boot/u-boot.mk
===================================================================
--- trunk/buildroot/target/device/armadeus/u-boot/u-boot.mk	2008-12-29 15:11:09 UTC (rev 980)
+++ trunk/buildroot/target/device/armadeus/u-boot/u-boot.mk	2009-01-01 16:15:24 UTC (rev 981)
@@ -6,7 +6,9 @@
 
 U_BOOT_BIN=$(BOARD_NAME)-u-boot.bin
 BR2_TARGET_U_BOOT_CONFIG_BOARD=$(BOARD_NAME)
+ifndef BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE
 BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE=$(BOARD_PATH)/$(BOARD_NAME).h
+endif
 MKIMAGE_BINLOC:=$(STAGING_DIR)/usr/bin/mkimage
 MKIMAGE:=$(KERNEL_CROSS)mkimage
 

Modified: trunk/patches/051-buildroot-u-boot.diff
===================================================================
--- trunk/patches/051-buildroot-u-boot.diff	2008-12-29 15:11:09 UTC (rev 980)
+++ trunk/patches/051-buildroot-u-boot.diff	2009-01-01 16:15:24 UTC (rev 981)
@@ -1,8 +1,28 @@
 --- buildroot/target/u-boot.ref/Config.in	2008-11-03 09:15:09.000000000 +0100
 +++ buildroot/target/u-boot/Config.in	2008-11-13 22:01:30.000000000 +0100
-@@ -80,3 +80,10 @@ config BR2_TARGET_UBOOT_TOOL_ENV
+@@ -7,11 +7,18 @@
+ config BR2_TARGET_UBOOT_BOARDNAME
+ 	string "board name"
  	depends on BR2_TARGET_UBOOT
+-	default "$(BOARD_NAME)"
++	default "$(BR2_BOARD_NAME)"
  	help
+ 	  One of U-Boot supported boards to be built.
+ 	  This will be suffixed with _config to meet U-Boot standard naming.
+ 
++config BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE
++	string "U-Boot header file"
++	depends on BR2_TARGET_UBOOT
++	default "$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME).h"
++	help
++	  U-Boot config Header file to use to build U-Boot for your target.
++
+ config BR2_TARGET_UBOOT_CUSTOM_PATCH
+ 	string "custom patch"
+ 	depends on BR2_TARGET_UBOOT
+@@ -80,3 +87,10 @@
+ 	depends on BR2_TARGET_UBOOT
+ 	help
  	  Install fw_printenv / fw_setenv tools in target.
 +
 +config BR2_TARGET_UBOOT_COPYTO

Added: trunk/patches/062-buildroot-add-uboot-conf-to-saved-project.diff
===================================================================
--- trunk/patches/062-buildroot-add-uboot-conf-to-saved-project.diff	                        (rev 0)
+++ trunk/patches/062-buildroot-add-uboot-conf-to-saved-project.diff	2009-01-01 16:15:24 UTC (rev 981)
@@ -0,0 +1,18 @@
+--- buildroot/project/project.mk.ref	2008-11-03 09:15:03.000000000 +0100
++++ buildroot/project/project.mk	2009-01-01 16:54:02.000000000 +0100
+@@ -40,10 +40,12 @@
+ 		$(SED) '/BR2_UCLIBC_CONFIG/d' $(PROJECT_FILE); \
+ 		echo "BR2_UCLIBC_CONFIG=\"$(LOCAL)/$(PROJECT)/uclibc-$(UCLIBC_VER).config\"" >> $(PROJECT_FILE); \
+ 	fi
+-	if [ -f $(UBOOT_DIR)/include/configs/$(PROJECT).h ]; then \
++	if [ -f $(U_BOOT_DIR)/include/configs/$(BOARD_NAME).h ]; then \
+ 		mkdir -p $(LOCAL)/$(PROJECT)/u-boot; \
+-		cp $(UBOOT_DIR)/include/configs/$(PROJECT).h \
+-			$(LOCAL)/$(PROJECT)/u-boot/$(PROJECT).h; \
++		cp $(U_BOOT_DIR)/include/configs/$(BOARD_NAME).h \
++			$(LOCAL)/$(PROJECT)/u-boot/$(BOARD_NAME).h; \
++		$(SED) '/BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE/d' $(PROJECT_FILE); \
++		echo "BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE=\"$(LOCAL)/$(PROJECT)/u-boot/$(BOARD_NAME).h\"" >> $(PROJECT_FILE); \
+ 	fi
+ 
+ getconfig: $(CONFIG)/conf


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.