This patch changes Qi to insist to fetch device-specific kernels from
filesystems that have named kernels. The kernels looked for are now
called
GTA01: /boot/uImage-GTA01.bin
GTA02: /boot/uImage-GTA02.bin
GTA03: /boot/uImage-GTA03.bin
This is part of the support for single rootfs that can be run on
multiple devices with correct kernel and module handling by the
bootloader.
Signed-off-by: Andy Green <[EMAIL PROTECTED]>
---
dfu-qi | 6 +++---
src/cpu/s3c2410/gta01.c | 4 ++--
src/cpu/s3c2442/gta02.c | 4 ++--
src/cpu/s3c6410/gta03-steppingstone.c | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dfu-qi b/dfu-qi
index 7bd103d..f5e6e1e 100755
--- a/dfu-qi
+++ b/dfu-qi
@@ -1,7 +1,7 @@
#!/bin/bash
-../dfu-util/src/dfu-util -a 1 -d 0x1d50:0x5119 -D image/qi-*.udfu
+../dfu-util/src/dfu-util -a 1 -d 0x1d50:0x5119 -D image/qi-s3c2442*.udfu
if [ $? -eq 1 ] ; then
-../dfu-util/src/dfu-util -a 1 -d 0x1d50:0x5120 -D image/qi-*.udfu
-../dfu-util/src/dfu-util -a 1 -d 0x1d50:0x5119 -D image/qi-*.udfu
+../dfu-util/src/dfu-util -a 1 -d 0x1d50:0x5120 -D image/qi-s3c2442*.udfu
+../dfu-util/src/dfu-util -a 1 -d 0x1d50:0x5119 -D image/qi-s3c2442*.udfu
fi
diff --git a/src/cpu/s3c2410/gta01.c b/src/cpu/s3c2410/gta01.c
index 5d97daa..b6d6db8 100644
--- a/src/cpu/s3c2410/gta01.c
+++ b/src/cpu/s3c2410/gta01.c
@@ -232,7 +232,7 @@ const struct board_api board_api_gta01 = {
.block_read = sd_card_block_read_gta01,
.partition_index = 1,
.filesystem = FS_EXT2,
- .filepath = "boot/uImage",
+ .filepath = "boot/uImage-GTA01.bin",
.commandline = "mtdparts=" \
"neo1973-nand:" \
"0x00040000(qi)," \
@@ -253,7 +253,7 @@ const struct board_api board_api_gta01 = {
.block_read = sd_card_block_read_gta01,
.partition_index = 2,
.filesystem = FS_EXT2,
- .filepath = "boot/uImage",
+ .filepath = "boot/uImage-GTA01.bin",
.commandline = "mtdparts=" \
"neo1973-nand:" \
"0x00040000(qi)," \
diff --git a/src/cpu/s3c2442/gta02.c b/src/cpu/s3c2442/gta02.c
index 06d270f..662f1e8 100644
--- a/src/cpu/s3c2442/gta02.c
+++ b/src/cpu/s3c2442/gta02.c
@@ -383,7 +383,7 @@ const struct board_api board_api_gta02 = {
.block_read = sd_card_block_read_gta02,
.partition_index = 1,
.filesystem = FS_EXT2,
- .filepath = "boot/uImage.bin",
+ .filepath = "boot/uImage-GTA02.bin",
.commandline = "mtdparts=physmap-flash:-(nor);" \
"neo1973-nand:" \
"0x00040000(qi)," \
@@ -405,7 +405,7 @@ const struct board_api board_api_gta02 = {
.block_read = sd_card_block_read_gta02,
.partition_index = 2,
.filesystem = FS_EXT2,
- .filepath = "boot/uImage.bin",
+ .filepath = "boot/uImage-GTA02.bin",
.commandline = "mtdparts=physmap-flash:-(nor);" \
"neo1973-nand:" \
"0x00040000(qi)," \
diff --git a/src/cpu/s3c6410/gta03-steppingstone.c
b/src/cpu/s3c6410/gta03-steppingstone.c
index 731604d..ec9d63e 100644
--- a/src/cpu/s3c6410/gta03-steppingstone.c
+++ b/src/cpu/s3c6410/gta03-steppingstone.c
@@ -63,7 +63,7 @@ const struct board_api board_api_gta03 = {
.block_read = sd_card_block_read_gta03,
.filesystem = FS_EXT2,
.partition_index = 2,
- .filepath = "boot/uImage.bin",
+ .filepath = "boot/uImage-GTA03.bin",
.commandline = "console=ttySAC3,115200 " \
"loglevel=8 init=/bin/sh " \
"root=/dev/mmcblk0p2 rootfstype=ext3"
@@ -73,7 +73,7 @@ const struct board_api board_api_gta03 = {
.block_read = sd_card_block_read_gta03,
.filesystem = FS_EXT2,
.partition_index = 3,
- .filepath = "boot/uImage.bin",
+ .filepath = "boot/uImage-GTA03.bin",
.commandline = "console=ttySAC3,115200 " \
"loglevel=8 init=/bin/sh " \
"root=/dev/mmcblk0p3 rootfstype=ext3"
