From 944e8111b8b486194af9575433e1ab37f41c7aa1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 12 Apr 2014 13:44:02 +0200 Subject: [PATCH] machines: sync u-boot config name with boards.cfg Recent u-boots (e.g. 2014.04-rc) need the _config appended to work, so add that and sync the names with boards.cfg as well. Signed-off-by: Koen Kooi --- conf/machine/cubieboard.conf | 2 +- conf/machine/cubieboard2.conf | 2 +- conf/machine/cubietruck.conf | 2 +- conf/machine/mele.conf | 2 +- conf/machine/meleg.conf | 2 +- conf/machine/olinuxino-a10.conf | 2 +- conf/machine/olinuxino-a10s.conf | 2 +- conf/machine/olinuxino-a13.conf | 2 +- conf/machine/olinuxino-a20.conf | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conf/machine/cubieboard.conf b/conf/machine/cubieboard.conf index ab802d0..236a702 100644 --- a/conf/machine/cubieboard.conf +++ b/conf/machine/cubieboard.conf @@ -9,7 +9,7 @@ require conf/machine/include/tune-cortexa8.inc require conf/machine/include/sunxi.inc require conf/machine/include/sunxi-mali.inc -UBOOT_MACHINE = "cubieboard" +UBOOT_MACHINE = "Cubieboard_config" UBOOT_ENTRYPOINT = "0x40008000" UBOOT_LOADADDRESS = "0x40008000" diff --git a/conf/machine/cubieboard2.conf b/conf/machine/cubieboard2.conf index 1a98983..2341216 100644 --- a/conf/machine/cubieboard2.conf +++ b/conf/machine/cubieboard2.conf @@ -9,7 +9,7 @@ require conf/machine/include/tune-cortexa7.inc require conf/machine/include/sunxi.inc require conf/machine/include/sunxi-mali.inc -UBOOT_MACHINE = "cubieboard2" +UBOOT_MACHINE = "Cubieboard2_config" UBOOT_ENTRYPOINT = "0x40008000" UBOOT_LOADADDRESS = "0x40008000" diff --git a/conf/machine/cubietruck.conf b/conf/machine/cubietruck.conf index ce25c45..8720801 100644 --- a/conf/machine/cubietruck.conf +++ b/conf/machine/cubietruck.conf @@ -9,7 +9,7 @@ require conf/machine/include/tune-cortexa7.inc require conf/machine/include/sunxi.inc require conf/machine/include/sunxi-mali.inc -UBOOT_MACHINE = "cubietruck" +UBOOT_MACHINE = "Cubietruck_config" UBOOT_ENTRYPOINT = "0x40008000" UBOOT_LOADADDRESS = "0x40008000" diff --git a/conf/machine/mele.conf b/conf/machine/mele.conf index 7d4ca4a..30f295b 100644 --- a/conf/machine/mele.conf +++ b/conf/machine/mele.conf @@ -9,7 +9,7 @@ require conf/machine/include/tune-cortexa8.inc require conf/machine/include/sunxi.inc require conf/machine/include/sunxi-mali.inc -UBOOT_MACHINE = "mele_a1000" +UBOOT_MACHINE = "Mele_A1000_config" UBOOT_ENTRYPOINT = "0x40008000" UBOOT_LOADADDRESS = "0x40008000" diff --git a/conf/machine/meleg.conf b/conf/machine/meleg.conf index 8eb0967..f36f1dd 100644 --- a/conf/machine/meleg.conf +++ b/conf/machine/meleg.conf @@ -9,7 +9,7 @@ require conf/machine/include/tune-cortexa8.inc require conf/machine/include/sunxi.inc require conf/machine/include/sunxi-mali.inc -UBOOT_MACHINE = "mele_a1000g" +UBOOT_MACHINE = "Mele_A1000G_config" UBOOT_ENTRYPOINT = "0x40008000" UBOOT_LOADADDRESS = "0x40008000" diff --git a/conf/machine/olinuxino-a10.conf b/conf/machine/olinuxino-a10.conf index 0f0af62..b08384d 100644 --- a/conf/machine/olinuxino-a10.conf +++ b/conf/machine/olinuxino-a10.conf @@ -11,7 +11,7 @@ require conf/machine/include/sunxi.inc require conf/machine/include/sunxi-mali.inc -UBOOT_MACHINE = "a10-olinuxino-lime" +UBOOT_MACHINE = "A10-OLinuXino-Lime_config" UBOOT_ENTRYPOINT = "0x40008000" UBOOT_LOADADDRESS = "0x40008000" diff --git a/conf/machine/olinuxino-a10s.conf b/conf/machine/olinuxino-a10s.conf index a6719b0..dd56136 100644 --- a/conf/machine/olinuxino-a10s.conf +++ b/conf/machine/olinuxino-a10s.conf @@ -10,7 +10,7 @@ require conf/machine/include/tune-cortexa8.inc require conf/machine/include/sunxi.inc -UBOOT_MACHINE = "a10s-olinuxino-m" +UBOOT_MACHINE = "A10s-OLinuXino-M_config" UBOOT_ENTRYPOINT = "0x40008000" UBOOT_LOADADDRESS = "0x40008000" diff --git a/conf/machine/olinuxino-a13.conf b/conf/machine/olinuxino-a13.conf index 39c0f23..aaf4367 100644 --- a/conf/machine/olinuxino-a13.conf +++ b/conf/machine/olinuxino-a13.conf @@ -10,7 +10,7 @@ require conf/machine/include/tune-cortexa8.inc require conf/machine/include/sunxi.inc require conf/machine/include/sunxi-mali.inc -UBOOT_MACHINE = "a13-olinuxino" +UBOOT_MACHINE = "A13-OLinuXino_config" UBOOT_ENTRYPOINT = "0x40008000" UBOOT_LOADADDRESS = "0x40008000" diff --git a/conf/machine/olinuxino-a20.conf b/conf/machine/olinuxino-a20.conf index 38a039f..52c4878 100644 --- a/conf/machine/olinuxino-a20.conf +++ b/conf/machine/olinuxino-a20.conf @@ -7,7 +7,7 @@ require conf/machine/include/tune-cortexa7.inc require conf/machine/include/sunxi.inc require conf/machine/include/sunxi-mali.inc -UBOOT_MACHINE = "a20-olinuxino_micro" +UBOOT_MACHINE = "A20-OLinuXino_MICRO_config" UBOOT_ENTRYPOINT = "0x40008000" UBOOT_LOADADDRESS = "0x40008000"