From 6e8356065687546693129064226d0bcdb238d750 Mon Sep 17 00:00:00 2001 From: Michel Pollet Date: Sat, 4 Apr 2009 16:49:22 +0100 Subject: [PATCH] Added support for u-boot git Automagically load u-boot git and build that. Make sure we use the 16k aligned one, so it can be flashed with mtd_debug. Signed-off-by: Michel Pollet --- conf/machine/mini2440.conf | 11 ++++------- .../linux-mini2440-2.6.29+git/defconfig-mini2440 | 0 .../linux/linux-mini2440_2.6.29+git.bb | 0 recipes/u-boot/u-boot_git.bb | 7 +++++++ 4 files changed, 11 insertions(+), 7 deletions(-) rename {packages => recipes}/linux/linux-mini2440-2.6.29+git/defconfig-mini2440 (100%) rename {packages => recipes}/linux/linux-mini2440_2.6.29+git.bb (100%) diff --git a/conf/machine/mini2440.conf b/conf/machine/mini2440.conf index 5ac3765666..f72bb24f9c 100644 --- a/conf/machine/mini2440.conf +++ b/conf/machine/mini2440.conf @@ -5,6 +5,7 @@ TARGET_ARCH = "arm" +PREFERRED_VERSION_u-boot = "git" PREFERRED_PROVIDER_virtual/kernel = "linux-mini2440" # used by sysvinit_2 @@ -15,10 +16,10 @@ IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \ IMAGE_FSTYPES = "jffs2 ext3 tar.gz" -MACHINE_FEATURES = "kernel26 touchscreen screen lcd rgb16" +MACHINE_FEATURES = "kernel26 uboot touchscreen screen lcd rgb16" MACHINE_FEATURES += "usbhost usbgadget" MACHINE_FEATURES += "i2c spi" -MACHINE_FEATURES += "mmc mmcroot" +MACHINE_FEATURES += "mmc mmcroot vfat" MACHINE_FEATURES += "ethernet" MACHINE_FEATURES += "sound alsa" @@ -26,9 +27,5 @@ KERNEL_IMAGETYPE = "uImage" require conf/machine/include/tune-arm920t.inc -#FEED_ARCH = "armv4t" -#BASE_PACKAGE_ARCH = "armv4t" -#TARGET_CC_ARCH = "-marm -march=armv4t -mtune=arm920t" -#PACKAGE_EXTRA_ARCHS += "armv4 armv4t" - +EXTRA_IMAGEDEPENDS += "u-boot" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --squash -s 0x200 -n -e 16KiB" diff --git a/packages/linux/linux-mini2440-2.6.29+git/defconfig-mini2440 b/recipes/linux/linux-mini2440-2.6.29+git/defconfig-mini2440 similarity index 100% rename from packages/linux/linux-mini2440-2.6.29+git/defconfig-mini2440 rename to recipes/linux/linux-mini2440-2.6.29+git/defconfig-mini2440 diff --git a/packages/linux/linux-mini2440_2.6.29+git.bb b/recipes/linux/linux-mini2440_2.6.29+git.bb similarity index 100% rename from packages/linux/linux-mini2440_2.6.29+git.bb rename to recipes/linux/linux-mini2440_2.6.29+git.bb diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index ebe686c378..48fc84e228 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -55,6 +55,9 @@ SRCREV_sequoa = "cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093" SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git " SRC_URI_sequoia = "git://www.denx.de/git/u-boot.git;protocol=git;tag=cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093 " +SRC_URI_mini2440 = "git://repo.or.cz/u-boot-openmoko/mini2440.git;protocol=git;branch=dev-mini2440-stable" +SRCREV_mini2440 = "3516c35fb777ca959e5cadf2156a792ca10e1cff" + SRC_URI_neuros-osd2 += "file://Makefile-fix.patch;patch=1" SRC_URI_append_akita = "file://pdaXrom-u-boot.patch;patch=1 \ file://uboot-eabi-fix-HACK2.patch;patch=1 \ @@ -83,3 +86,7 @@ do_configure_prepend_spitz() { do_configure_prepend_c7x0() { sed -i s:ROOT_FLASH_SIZE:${ROOT_FLASH_SIZE}:g ${S}/include/configs/corgi.h } + +do_deploy_prepend_mini2440() { + cp ${S}/u-boot-nand16k.bin ${S}/u-boot.bin +} -- 2.39.5