[U-Boot] [PATCH v3 07/15] qemu-malta: rename to just "malta"
Paul Burton
paul.burton at imgtec.com
Thu Oct 24 12:11:29 CEST 2013
This is in preparation for adapting this board to function correctly on
a physical MIPS Malta board. The board is moved into an "imgtec" vendor
directory at the same time in order to ready us for any other boards
supported by Imagination in the future.
Signed-off-by: Paul Burton <paul.burton at imgtec.com>
---
Changes in v3:
- modify a missed CONFIG_QEMU_MALTA in arch/mips/cpu/mips32/start.S
which would affect old QEMU builds
Changes in v2:
- move to an imgtec vendor directory to reduce churn should other
Imagination boards be added later
- enable rename detection for the patch
---
arch/mips/cpu/mips32/start.S | 2 +-
arch/mips/lib/bootm.c | 12 ++++++------
board/{qemu-malta => imgtec/malta}/Makefile | 0
board/{qemu-malta => imgtec/malta}/lowlevel_init.S | 0
board/{qemu-malta/qemu-malta.c => imgtec/malta/malta.c} | 0
boards.cfg | 4 ++--
include/configs/{qemu-malta.h => malta.h} | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
rename board/{qemu-malta => imgtec/malta}/Makefile (100%)
rename board/{qemu-malta => imgtec/malta}/lowlevel_init.S (100%)
rename board/{qemu-malta/qemu-malta.c => imgtec/malta/malta.c} (100%)
rename include/configs/{qemu-malta.h => malta.h} (98%)
diff --git a/arch/mips/cpu/mips32/start.S b/arch/mips/cpu/mips32/start.S
index 70ad198..68e59b5 100644
--- a/arch/mips/cpu/mips32/start.S
+++ b/arch/mips/cpu/mips32/start.S
@@ -51,7 +51,7 @@ _start:
*/
.word CONFIG_SYS_XWAY_EBU_BOOTCFG
.word 0x0
-#elif defined(CONFIG_QEMU_MALTA)
+#elif defined(CONFIG_MALTA)
/*
* Linux expects the Board ID here.
*/
diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index 66340ea..1febf29 100644
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -17,10 +17,10 @@ DECLARE_GLOBAL_DATA_PTR;
#define LINUX_MAX_ENVS 256
#define LINUX_MAX_ARGS 256
-#if defined(CONFIG_QEMU_MALTA)
-#define mips_boot_qemu_malta 1
+#if defined(CONFIG_MALTA)
+#define mips_boot_malta 1
#else
-#define mips_boot_qemu_malta 0
+#define mips_boot_malta 0
#endif
static int linux_argc;
@@ -139,7 +139,7 @@ static void linux_env_set(const char *env_name, const char *env_val)
strcpy(linux_env_p, env_name);
linux_env_p += strlen(env_name);
- if (mips_boot_qemu_malta) {
+ if (mips_boot_malta) {
linux_env_p++;
linux_env[++linux_env_idx] = linux_env_p;
} else {
@@ -196,7 +196,7 @@ static void boot_prep_linux(bootm_headers_t *images)
if (cp)
linux_env_set("eth1addr", cp);
- if (mips_boot_qemu_malta)
+ if (mips_boot_malta)
linux_env_set("modetty0", "38400n8r");
}
@@ -210,7 +210,7 @@ static void boot_jump_linux(bootm_headers_t *images)
bootstage_mark(BOOTSTAGE_ID_RUN_OS);
- if (mips_boot_qemu_malta)
+ if (mips_boot_malta)
linux_extra = gd->ram_size;
/* we assume that the kernel is in place */
diff --git a/board/qemu-malta/Makefile b/board/imgtec/malta/Makefile
similarity index 100%
rename from board/qemu-malta/Makefile
rename to board/imgtec/malta/Makefile
diff --git a/board/qemu-malta/lowlevel_init.S b/board/imgtec/malta/lowlevel_init.S
similarity index 100%
rename from board/qemu-malta/lowlevel_init.S
rename to board/imgtec/malta/lowlevel_init.S
diff --git a/board/qemu-malta/qemu-malta.c b/board/imgtec/malta/malta.c
similarity index 100%
rename from board/qemu-malta/qemu-malta.c
rename to board/imgtec/malta/malta.c
diff --git a/boards.cfg b/boards.cfg
index aa2ee64..5c92868 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -480,10 +480,10 @@ Active m68k mcf547x_8x - freescale m548xevb
Active m68k mcf547x_8x - freescale m548xevb M5485GFE M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64 TsiChung Liew <Tsi-Chung.Liew at freescale.com>
Active m68k mcf547x_8x - freescale m548xevb M5485HFE M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO TsiChung Liew <Tsi-Chung.Liew at freescale.com>
Active microblaze microblaze - xilinx microblaze-generic microblaze-generic - Michal Simek <monstr at monstr.eu>
-Active mips mips32 - - qemu-malta qemu_malta qemu-malta:MIPS32,SYS_BIG_ENDIAN -
-Active mips mips32 - - qemu-malta qemu_maltael qemu-malta:MIPS32,SYS_LITTLE_ENDIAN -
Active mips mips32 - - qemu-mips qemu_mips qemu-mips:SYS_BIG_ENDIAN Vlad Lungu <vlad.lungu at windriver.com>
Active mips mips32 - - qemu-mips qemu_mipsel qemu-mips:SYS_LITTLE_ENDIAN -
+Active mips mips32 - imgtec malta malta malta:MIPS32,SYS_BIG_ENDIAN -
+Active mips mips32 - imgtec malta maltael malta:MIPS32,SYS_LITTLE_ENDIAN -
Active mips mips32 - micronas vct vct_platinum vct:VCT_PLATINUM -
Active mips mips32 - micronas vct vct_platinum_onenand vct:VCT_PLATINUM,VCT_ONENAND -
Active mips mips32 - micronas vct vct_platinum_onenand_small vct:VCT_PLATINUM,VCT_ONENAND,VCT_SMALL_IMAGE -
diff --git a/include/configs/qemu-malta.h b/include/configs/malta.h
similarity index 98%
rename from include/configs/qemu-malta.h
rename to include/configs/malta.h
index 4e7ad33..f6f6cc1 100644
--- a/include/configs/qemu-malta.h
+++ b/include/configs/malta.h
@@ -13,7 +13,7 @@
/*
* System configuration
*/
-#define CONFIG_QEMU_MALTA
+#define CONFIG_MALTA
#define CONFIG_PCI
#define CONFIG_PCI_GT64120
--
1.8.4
More information about the U-Boot
mailing list