[oe-commits] Ulf Samuelsson : Allow custom defconfigs in at91bootstrap

[git version control]

Module: openembedded.git
Branch: ulf/linux-2.6.30.2
Commit: b39070e522e21c2b66f7e457bacad05d05ce0c39
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=b39070e522e21c2b66f7e457bacad05d05ce0c39

Author: Ulf Samuelsson <ulf.samuelsson at atmel.com>
Date:   Wed Aug 19 07:28:05 2009 +0200

Allow custom defconfigs in at91bootstrap

---

 recipes/at91bootstrap/at91bootstrap.inc         |   32 +++++++++++++++++++---
 recipes/at91bootstrap/at91bootstrap_2.13-rc1.bb |   20 +++++++++-----
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/recipes/at91bootstrap/at91bootstrap.inc b/recipes/at91bootstrap/at91bootstrap.inc
index d623ba5..0434544 100644
--- a/recipes/at91bootstrap/at91bootstrap.inc
+++ b/recipes/at91bootstrap/at91bootstrap.inc
@@ -1,8 +1,17 @@
-DESCRIPTION = "at91bootstrap: loaded into internal SRAM by AT91 BootROM"
-SECTION = "bootloaders"
+# Common include file for at91bootstrap-2.13-rc1 and later
 
 S = "${WORKDIR}/at91bootstrap-${PV}"
+
 PACKAGE_ARCH = "${AT91BOOTSTRAP_BOARD}"
+PACKAGES = "${PN}"
+
+FILES_${PN} = "\
+	/home/root/* \
+	"
+
+AT91BOOTSTRAP_BOARD_DIR = "${S}/boards/${AT91BOOTSTRAP_BOARD}"
+AT91BOOTSTRAP_BOARD_CONFIG="${AT91BOOTSTRAP_BOARD}_defconfig"
+
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} DESTDIR=${DEPLOY_DIR_IMAGE} REVISION=${PR}"
 PARALLEL_MAKE = ""
 
@@ -10,9 +19,20 @@ do_compile () {
 	unset LDFLAGS
 	unset CFLAGS
 	unset CPPFLAGS
+	echo "FILESPATH = ${FILESPATH}"
+	echo "FILESDIR = ${FILESDIR}"
 
 	rm -Rf ${S}/binaries
-	oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" ${PACKAGE_ARCH}_defconfig
+	rm	-Rf	${S}/binaries
+
+	# Copy the defconfig file to the board directory, (if we provide one)
+	# Atmel supplied boards normally has a valid defconfig
+	if	test -e ${WORKDIR}/defconfig ; then
+		mkdir -p	${AT91BOOTSTRAP_BOARD_DIR}
+		cp ${WORKDIR}/defconfig	${AT91BOOTSTRAP_BOARD}
+	fi
+
+	oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" ${AT91BOOTSTRAP_BOARD_CONFIG}
 	oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}"
 	oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" boot
 }
@@ -35,8 +55,10 @@ do_install() {
 
 	oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" install
 
-	copy_file	AT91SAM9G45_RomCode_Replacement.bin	${WORKDIR}	${DEPLOY_DIR_IMAGE}
-	copy_file	README.txt				${WORKDIR}	${DEPLOY_DIR_IMAGE}
+	if [ "${AT91BOOTSTRAP_BOARD}x" == "at91sam9g45ekes" ]; then
+		copy_file	AT91SAM9G45_RomCode_Replacement.bin	${WORKDIR}	${DEPLOY_DIR_IMAGE}
+		copy_file	README.txt				${WORKDIR}	${DEPLOY_DIR_IMAGE}
+	fi
 	copy_file	NAND-empty-1MB.jffs2			${WORKDIR}	${DEPLOY_DIR_IMAGE}
 	copy_file	mk-sd-card.sh				${WORKDIR}	${DEPLOY_DIR_IMAGE}
 	copy_file	write-to-SD-card.sh			${WORKDIR}	${DEPLOY_DIR_IMAGE}
diff --git a/recipes/at91bootstrap/at91bootstrap_2.13-rc1.bb b/recipes/at91bootstrap/at91bootstrap_2.13-rc1.bb
index 6987e2c..9949f7c 100644
--- a/recipes/at91bootstrap/at91bootstrap_2.13-rc1.bb
+++ b/recipes/at91bootstrap/at91bootstrap_2.13-rc1.bb
@@ -1,19 +1,25 @@
-require at91bootstrap.inc
-PR = "r1"
+DESCRIPTION = "at91bootstrap: loaded into internal SRAM by AT91 BootROM"
+SECTION = "bootloaders"
 
+PR = "r2"
 
 SRC_URI = "ftp://www.at91.com/pub/buildroot/${PN}-${PV}.tar.bz2 \
 	   file://NAND-empty-1MB.jffs2.bz2 \
 	   file://SD-card-tools.tar.bz2 \
 	"
 
-SRC_URI_append_at91sam9g45ek = " \
+SRC_URI_append_at91sam9g45ekes = " \
 	file://at91sam9g45ekes/AT91SAM9G45_RomCode_Replacement.zip \
 	"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-PACKAGES = "${PN}"
 
-FILES_${PN} = "\
-	/home/root/* \
+# at91sam9g45ek is not yet available, so add sam9g45ekes
+SRC_URI_append_at91sam9g45ek = " \
+	file://at91sam9g45ekes/AT91SAM9G45_RomCode_Replacement.zip \
 	"
 
+# This is the way to add a custom defconfig
+SRC_URI_append_at91customek = \
+	file://defconfig \
+	#
+
+require at91bootstrap.inc