diff options
| -rw-r--r-- | packages/linux/linux-gta01.inc | 2 | ||||
| -rw-r--r-- | packages/linux/linux-gta01_2.6.21.3.bb | 2 | ||||
| -rw-r--r-- | packages/linux/linux-gta01_2.6.21.5.bb | 2 | ||||
| -rw-r--r-- | packages/linux/linux-smdk2443_2.6.20+git.bb | 2 | ||||
| -rw-r--r-- | packages/linux/linux.inc | 10 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/.mtn2git_empty (renamed from packages/uboot/u-boot-mkimage-gta01-native/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/bbt-create-optional.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/bbt-create-optional.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/bbt-scan-second.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/bbt-scan-second.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-and-nand.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-and-nand.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-reloc.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-reloc.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/boot-menu.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/boot-menu.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/cmd-unzip.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/cmd-unzip.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/console-ansi.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/console-ansi.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/default-env.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/default-env.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/dontask.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/dontask.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/dynenv-harden.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/dynenv-harden.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/early-powerdown.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/early-powerdown.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/enable-splash-bmp.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/enable-splash-bmp.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/env_nand_oob.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/env_nand_oob.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/ext2load_hex.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/ext2load_hex.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/lowlevel_foo.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/lowlevel_foo.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/mmcinit-power-up.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/mmcinit-power-up.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/nand-badisbad.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/nand-badisbad.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/nand-createbbt.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/nand-createbbt.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/nand-dynamic_partitions.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/nand-dynamic_partitions.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/nand-otp.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/nand-otp.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/nand-read_write_oob.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/nand-read_write_oob.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/neo1973-chargefast.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/neo1973-chargefast.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/preboot-override.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/preboot-override.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/raise-limits.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/raise-limits.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/series (renamed from packages/uboot/u-boot-mkimage-gta01-native/series) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/splashimage-command.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/splashimage-command.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-neo1973.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-neo1973.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-qt2410.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-qt2410.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920_s3c2410_irq_demux.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920_s3c2410_irq_demux.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920t-gd_in_irq.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920t-gd_in_irq.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-bbt-quiet.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-bbt-quiet.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-cmd_s3c2410.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-cmd_s3c2410.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-cramfs_but_no_jffs2.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-dfu.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-dfu.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-gta02.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-gta02.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-hxd8.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-license.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-license.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-machtypes.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-machtypes.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-mokoversion.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-mokoversion.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-nand-markbad-reallybad.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-nand-markbad-reallybad.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-defaultenv.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-resume.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-resume.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-misccr-definitions.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-misccr-definitions.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-mmc.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-mmc.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-nand.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-nand.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-norelocate_irqvec_cpy.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-norelocate_irqvec_cpy.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-warnings-fix.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-warnings-fix.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_fb.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_fb.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_udc.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_udc.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2440.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2440.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2443.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2443.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2440.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2440.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2443.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-strtoul.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-strtoul.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/uboot-usbtty-acm.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/uboot-usbtty-acm.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/unbusy-i2c.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/unbusy-i2c.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/usbdcore-multiple_configs.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/usbdcore-multiple_configs.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native/wakeup-reason-nand-only.patch (renamed from packages/uboot/u-boot-mkimage-gta01-native/wakeup-reason-nand-only.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-openmoko-native_oe.bb (renamed from packages/uboot/u-boot-mkimage-gta01-native_oe.bb) | 0 | ||||
| -rw-r--r-- | packages/uboot/uboot-openmoko_svn.bb (renamed from packages/uboot/uboot-gta01_svn.bb) | 43 |
66 files changed, 32 insertions, 29 deletions
diff --git a/packages/linux/linux-gta01.inc b/packages/linux/linux-gta01.inc index 098ae9d069..7cc6c58b6b 100644 --- a/packages/linux/linux-gta01.inc +++ b/packages/linux/linux-gta01.inc @@ -3,7 +3,7 @@ SECTION = "kernel" AUTHOR = "Harald Welte <laforge@openmoko.org>" HOMEPAGE = "N/A" LICENSE = "GPL" -DEPENDS += "quilt-native uboot-gta01" +DEPENDS += "quilt-native uboot-openmoko" inherit kernel diff --git a/packages/linux/linux-gta01_2.6.21.3.bb b/packages/linux/linux-gta01_2.6.21.3.bb index cccc4dd6a1..18af85973a 100644 --- a/packages/linux/linux-gta01_2.6.21.3.bb +++ b/packages/linux/linux-gta01_2.6.21.3.bb @@ -4,7 +4,7 @@ SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto= SRC_URI += "file://fix-EVIOCGRAB-semantics.patch;patch=1" MOKOR = "moko10" -PR = "${MOKOR}-r3" +PR = "${MOKOR}-r4" VANILLA_VERSION = "2.6.21.3" diff --git a/packages/linux/linux-gta01_2.6.21.5.bb b/packages/linux/linux-gta01_2.6.21.5.bb index ced24462e7..9463138cf0 100644 --- a/packages/linux/linux-gta01_2.6.21.5.bb +++ b/packages/linux/linux-gta01_2.6.21.5.bb @@ -4,7 +4,7 @@ SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto= SRC_URI += "file://fix-EVIOCGRAB-semantics.patch;patch=1" MOKOR = "moko10" -PR = "${MOKOR}-r1" +PR = "r2" VANILLA_VERSION = "2.6.21.5" diff --git a/packages/linux/linux-smdk2443_2.6.20+git.bb b/packages/linux/linux-smdk2443_2.6.20+git.bb index b97ebd7327..6d129baea1 100644 --- a/packages/linux/linux-smdk2443_2.6.20+git.bb +++ b/packages/linux/linux-smdk2443_2.6.20+git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Linux Kernel for smdk2443 compatible machines" SECTION = "kernel" LICENSE = "GPL" -DEPENDS += "u-boot-mkimage-gta01-native" +DEPENDS += "u-boot-mkimage-openmoko-native" PR = "r1" diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index 1e4e58b089..cd347cb674 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -3,11 +3,11 @@ SECTION = "kernel" LICENSE = "GPL" # These devices need mkimage to generate a kernel image -DEPENDS_kb9202 = "u-boot-mkimage-gta01-native" -DEPENDS_at32stk1000 = "u-boot-mkimage-gta01-native" -DEPENDS_atngw100 = "u-boot-mkimage-gta01-native" -DEPENDS_at91sam9263ek = "u-boot-mkimage-gta01-native" -DEPENDS_sarge-at91 = "u-boot-mkimage-gta01-native" +DEPENDS_kb9202 = "u-boot-mkimage-openmoko-native" +DEPENDS_at32stk1000 = "u-boot-mkimage-openmoko-native" +DEPENDS_atngw100 = "u-boot-mkimage-openmoko-native" +DEPENDS_at91sam9263ek = "u-boot-mkimage-openmoko-native" +DEPENDS_sarge-at91 = "u-boot-mkimage-openmoko-native" inherit kernel diff --git a/packages/uboot/u-boot-mkimage-gta01-native/.mtn2git_empty b/packages/uboot/u-boot-mkimage-openmoko-native/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/.mtn2git_empty +++ b/packages/uboot/u-boot-mkimage-openmoko-native/.mtn2git_empty diff --git a/packages/uboot/u-boot-mkimage-gta01-native/bbt-create-optional.patch b/packages/uboot/u-boot-mkimage-openmoko-native/bbt-create-optional.patch index d7a2a872e5..d7a2a872e5 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/bbt-create-optional.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/bbt-create-optional.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/bbt-scan-second.patch b/packages/uboot/u-boot-mkimage-openmoko-native/bbt-scan-second.patch index 37b2807908..37b2807908 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/bbt-scan-second.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/bbt-scan-second.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-and-nand.patch b/packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-and-nand.patch index fa0de39ab7..fa0de39ab7 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-and-nand.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-and-nand.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-reloc.patch b/packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-reloc.patch index 53a3e05c67..53a3e05c67 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-reloc.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-reloc.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/boot-menu.patch b/packages/uboot/u-boot-mkimage-openmoko-native/boot-menu.patch index 352967ae06..352967ae06 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/boot-menu.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/boot-menu.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/cmd-unzip.patch b/packages/uboot/u-boot-mkimage-openmoko-native/cmd-unzip.patch index ee4c1984fc..ee4c1984fc 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/cmd-unzip.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/cmd-unzip.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/console-ansi.patch b/packages/uboot/u-boot-mkimage-openmoko-native/console-ansi.patch index 2ac5b75dee..2ac5b75dee 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/console-ansi.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/console-ansi.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/default-env.patch b/packages/uboot/u-boot-mkimage-openmoko-native/default-env.patch index b9ae4f29fe..b9ae4f29fe 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/default-env.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/default-env.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/dontask.patch b/packages/uboot/u-boot-mkimage-openmoko-native/dontask.patch index 23d4b13626..23d4b13626 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/dontask.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/dontask.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/dynenv-harden.patch b/packages/uboot/u-boot-mkimage-openmoko-native/dynenv-harden.patch index cf12352553..cf12352553 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/dynenv-harden.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/dynenv-harden.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/early-powerdown.patch b/packages/uboot/u-boot-mkimage-openmoko-native/early-powerdown.patch index 7326c2daa6..7326c2daa6 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/early-powerdown.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/early-powerdown.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/enable-splash-bmp.patch b/packages/uboot/u-boot-mkimage-openmoko-native/enable-splash-bmp.patch index dcb721c8d3..dcb721c8d3 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/enable-splash-bmp.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/enable-splash-bmp.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/env_nand_oob.patch b/packages/uboot/u-boot-mkimage-openmoko-native/env_nand_oob.patch index 5a2dd61461..5a2dd61461 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/env_nand_oob.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/env_nand_oob.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/ext2load_hex.patch b/packages/uboot/u-boot-mkimage-openmoko-native/ext2load_hex.patch index ff8e9cd6fc..ff8e9cd6fc 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/ext2load_hex.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/ext2load_hex.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/lowlevel_foo.patch b/packages/uboot/u-boot-mkimage-openmoko-native/lowlevel_foo.patch index 715c46ed81..715c46ed81 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/lowlevel_foo.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/lowlevel_foo.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/mmcinit-power-up.patch b/packages/uboot/u-boot-mkimage-openmoko-native/mmcinit-power-up.patch index fcf54b9fd1..fcf54b9fd1 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/mmcinit-power-up.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/mmcinit-power-up.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/nand-badisbad.patch b/packages/uboot/u-boot-mkimage-openmoko-native/nand-badisbad.patch index a5800e2499..a5800e2499 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/nand-badisbad.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/nand-badisbad.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/nand-createbbt.patch b/packages/uboot/u-boot-mkimage-openmoko-native/nand-createbbt.patch index 74b79da0a9..74b79da0a9 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/nand-createbbt.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/nand-createbbt.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/nand-dynamic_partitions.patch b/packages/uboot/u-boot-mkimage-openmoko-native/nand-dynamic_partitions.patch index ecce004ca6..ecce004ca6 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/nand-dynamic_partitions.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/nand-dynamic_partitions.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/nand-otp.patch b/packages/uboot/u-boot-mkimage-openmoko-native/nand-otp.patch index b0e9bf4c4b..b0e9bf4c4b 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/nand-otp.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/nand-otp.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/nand-read_write_oob.patch b/packages/uboot/u-boot-mkimage-openmoko-native/nand-read_write_oob.patch index 8360409e46..8360409e46 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/nand-read_write_oob.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/nand-read_write_oob.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/neo1973-chargefast.patch b/packages/uboot/u-boot-mkimage-openmoko-native/neo1973-chargefast.patch index 6f6af2c758..6f6af2c758 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/neo1973-chargefast.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/neo1973-chargefast.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/preboot-override.patch b/packages/uboot/u-boot-mkimage-openmoko-native/preboot-override.patch index f32cbde27b..f32cbde27b 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/preboot-override.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/preboot-override.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/raise-limits.patch b/packages/uboot/u-boot-mkimage-openmoko-native/raise-limits.patch index a1c381a2cf..a1c381a2cf 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/raise-limits.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/raise-limits.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/series b/packages/uboot/u-boot-mkimage-openmoko-native/series index 4fc7d1342f..4fc7d1342f 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/series +++ b/packages/uboot/u-boot-mkimage-openmoko-native/series diff --git a/packages/uboot/u-boot-mkimage-gta01-native/splashimage-command.patch b/packages/uboot/u-boot-mkimage-openmoko-native/splashimage-command.patch index 8ea48cf484..8ea48cf484 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/splashimage-command.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/splashimage-command.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-neo1973.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-neo1973.patch index 7c70244b38..7c70244b38 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-neo1973.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-neo1973.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-qt2410.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-qt2410.patch index 343598902f..343598902f 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-qt2410.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-qt2410.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920_s3c2410_irq_demux.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920_s3c2410_irq_demux.patch index b39a268c84..b39a268c84 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920_s3c2410_irq_demux.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920_s3c2410_irq_demux.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920t-gd_in_irq.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920t-gd_in_irq.patch index b3d7bc1166..b3d7bc1166 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920t-gd_in_irq.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920t-gd_in_irq.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-bbt-quiet.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-bbt-quiet.patch index 9b1febe956..9b1febe956 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-bbt-quiet.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-bbt-quiet.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-cmd_s3c2410.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cmd_s3c2410.patch index 993ef4f6f2..993ef4f6f2 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-cmd_s3c2410.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cmd_s3c2410.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-cramfs_but_no_jffs2.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch index 349b83697e..349b83697e 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-cramfs_but_no_jffs2.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-dfu.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-dfu.patch index 1122f4894f..1122f4894f 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-dfu.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-dfu.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-gta02.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-gta02.patch index ca54ebeff7..ca54ebeff7 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-gta02.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-gta02.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-hxd8.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch index f85fdea836..f85fdea836 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-hxd8.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-license.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-license.patch index 227a97e71a..227a97e71a 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-license.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-license.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-machtypes.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-machtypes.patch index db3cee6e99..db3cee6e99 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-machtypes.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-machtypes.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-mokoversion.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-mokoversion.patch index a44434155e..a44434155e 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-mokoversion.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-mokoversion.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-nand-markbad-reallybad.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-nand-markbad-reallybad.patch index d630889e3c..d630889e3c 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-nand-markbad-reallybad.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-nand-markbad-reallybad.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-defaultenv.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch index 7e3aa4f480..7e3aa4f480 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-defaultenv.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-resume.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-resume.patch index 19d912620d..19d912620d 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-resume.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-resume.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-misccr-definitions.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-misccr-definitions.patch index 6efe24651a..6efe24651a 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-misccr-definitions.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-misccr-definitions.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-mmc.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-mmc.patch index b775beaa07..b775beaa07 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-mmc.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-mmc.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-nand.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-nand.patch index dc363bbbab..dc363bbbab 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-nand.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-nand.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-norelocate_irqvec_cpy.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-norelocate_irqvec_cpy.patch index 0d5a49771d..0d5a49771d 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-norelocate_irqvec_cpy.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-norelocate_irqvec_cpy.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-warnings-fix.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-warnings-fix.patch index 8cc442a865..8cc442a865 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-warnings-fix.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-warnings-fix.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_fb.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_fb.patch index b50853554b..b50853554b 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_fb.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_fb.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_udc.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_udc.patch index 16bee3e26a..16bee3e26a 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_udc.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_udc.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2440.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2440.patch index da0fb8cf2d..da0fb8cf2d 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2440.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2440.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2443.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2443.patch index 62ae5592ab..62ae5592ab 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2443.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2443.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2440.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2440.patch index 09392ad2cf..09392ad2cf 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2440.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2440.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2443.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch index 5757cc078b..5757cc078b 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2443.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-strtoul.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-strtoul.patch index a88e94b006..a88e94b006 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-strtoul.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-strtoul.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-usbtty-acm.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-usbtty-acm.patch index 722a227aa6..722a227aa6 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/uboot-usbtty-acm.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-usbtty-acm.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/unbusy-i2c.patch b/packages/uboot/u-boot-mkimage-openmoko-native/unbusy-i2c.patch index 680b301620..680b301620 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/unbusy-i2c.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/unbusy-i2c.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/usbdcore-multiple_configs.patch b/packages/uboot/u-boot-mkimage-openmoko-native/usbdcore-multiple_configs.patch index 339289699a..339289699a 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/usbdcore-multiple_configs.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/usbdcore-multiple_configs.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/wakeup-reason-nand-only.patch b/packages/uboot/u-boot-mkimage-openmoko-native/wakeup-reason-nand-only.patch index 132a9f8da5..132a9f8da5 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native/wakeup-reason-nand-only.patch +++ b/packages/uboot/u-boot-mkimage-openmoko-native/wakeup-reason-nand-only.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native_oe.bb b/packages/uboot/u-boot-mkimage-openmoko-native_oe.bb index 5946be9c3f..5946be9c3f 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native_oe.bb +++ b/packages/uboot/u-boot-mkimage-openmoko-native_oe.bb diff --git a/packages/uboot/uboot-gta01_svn.bb b/packages/uboot/uboot-openmoko_svn.bb index 98622fe408..bb9bde7733 100644 --- a/packages/uboot/uboot-gta01_svn.bb +++ b/packages/uboot/uboot-openmoko_svn.bb @@ -44,33 +44,36 @@ do_configure_prepend() { } do_compile () { - chmod +x board/neo1973/gta*/split_by_variant.sh - for mach in ${UBOOT_MACHINES} - do - oe_runmake ${mach}_config - oe_runmake clean - oe_runmake all - oe_runmake u-boot.udfu - if [ -f u-boot.udfu ]; then - mv u-boot.udfu u-boot_${mach}.bin - else - mv u-boot.bin u-boot_${mach}.bin - fi - if [ -f board/${mach}/lowlevel_foo.bin ]; then - mv board/${mach}/lowlevel_foo.bin lowlevel_foo_${mach}.bin - fi - done + chmod +x board/neo1973/gta*/split_by_variant.sh + for mach in ${UBOOT_MACHINES} + do + oe_runmake ${mach}_config + oe_runmake clean + find board -name lowlevel_foo.bin -exec rm '{}' \; + oe_runmake all + oe_runmake u-boot.udfu + if [ -f u-boot.udfu ]; then + mv u-boot.udfu u-boot_${mach}.bin + else + mv u-boot.bin u-boot_${mach}.bin + fi + if [ -f board/${mach}/lowlevel_foo.bin ]; then + mv board/${mach}/lowlevel_foo.bin \ + lowlevel_foo_${mach}.bin + else + find board -name lowlevel_foo.bin \ + -exec mv '{}' lowlevel_foo_${mach}.bin \; + fi + done } do_deploy () { install -d ${DEPLOY_DIR_IMAGE} for mach in ${UBOOT_MACHINES} do - install -m 0644 ${S}/u-boot_${mach}.bin \ - ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PR}.bin + install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then - install -m 0644 ${S}/lowlevel_foo_${mach}.bin \ - ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PR}.bin + install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin fi done install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage |