qi-hardware/xburst-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/xburst-tools.git synced 2025-04-21 12:27:27 +03:00
Code Activity

qi-add-noboot-and-append-check.patch

Browse Source 
This adds two features that can be set in the rootfs that Qi is checking.

 - if it finds /boot/noboot-<device>, eg /boot/noboot-GTA02 then it will
   skip the rootfs for booting and try the next one if any

 - if it finds /boot/append-<device>, eg, /boot/append-GTA02 then it will
   append the contents of this file to the kernel commandline.

Signed-off-by: Andy Green <andy@openmoko.com>
This commit is contained in:
Andy Green
2008-11-28 10:16:45 +00:00
committed by Andy Green
parent 3565397f1c
commit 1b06d98bc7
6 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
qiboot/src/cpu/s3c2410/gta01.c
View File

@@ -235,6 +235,8 @@ const struct board_api board_api_gta01 = {
"init=/sbin/init "\
"ro",
.commandline_board_debug = " loglevel=8 console=tty0",
.noboot = "boot/noboot-GTA01",
.append = "boot/append-GTA01",
/* these are the ways we could boot GTA01 in order to try */
.kernel_source = {
[0] = {
@@ -244,7 +246,7 @@ const struct board_api board_api_gta01 = {
.partition_index = 1,
.filesystem = FS_EXT2,
.filepath = "boot/uImage-GTA01.bin",
.commandline_append = " root=/dev/mmcblk0p1",
.commandline_append = " root=/dev/mmcblk0p1 ",
},
[1] = {
.name = "SD Card EXT2 Kernel p2",
@@ -253,7 +255,7 @@ const struct board_api board_api_gta01 = {
.partition_index = 2,
.filesystem = FS_EXT2,
.filepath = "boot/uImage-GTA01.bin",
.commandline_append = " root=/dev/mmcblk0p2",
.commandline_append = " root=/dev/mmcblk0p2 ",
},
[2] = {
.name = "SD Card EXT2 Kernel p3",
@@ -262,7 +264,7 @@ const struct board_api board_api_gta01 = {
.partition_index = 3,
.filesystem = FS_EXT2,
.filepath = "boot/uImage-GTA01.bin",
.commandline_append = " root=/dev/mmcblk0p3",
.commandline_append = " root=/dev/mmcblk0p3 ",
},
[3] = {
.name = "NAND Kernel",

10
qiboot/src/cpu/s3c2442/gta02.c
View File

@@ -396,6 +396,8 @@ const struct board_api board_api_gta02 = {
"ro",
.commandline_board_debug = " console=tty0 " \
"loglevel=8",
.noboot = "boot/noboot-GTA02",
.append = "boot/append-GTA02",
/* these are the ways we could boot GTA02 in the order to try */
.kernel_source = {
[0] = {
@@ -405,7 +407,7 @@ const struct board_api board_api_gta02 = {
.partition_index = 1,
.filesystem = FS_EXT2,
.filepath = "boot/uImage-GTA02.bin",
.commandline_append = " root=/dev/mmcblk0p1",
.commandline_append = " root=/dev/mmcblk0p1 ",
},
[1] = {
.name = "SD Card EXT2 P2 Kernel",
@@ -414,7 +416,7 @@ const struct board_api board_api_gta02 = {
.partition_index = 2,
.filesystem = FS_EXT2,
.filepath = "boot/uImage-GTA02.bin",
.commandline_append = " root=/dev/mmcblk0p2",
.commandline_append = " root=/dev/mmcblk0p2 ",
},
[2] = {
.name = "SD Card EXT2 P3 Kernel",
@@ -423,7 +425,7 @@ const struct board_api board_api_gta02 = {
.partition_index = 3,
.filesystem = FS_EXT2,
.filepath = "boot/uImage-GTA02.bin",
.commandline_append = " root=/dev/mmcblk0p3",
.commandline_append = " root=/dev/mmcblk0p3 ",
},
[3] = {
.name = "NAND Kernel",
@@ -431,7 +433,7 @@ const struct board_api board_api_gta02 = {
.offset_blocks512_if_no_partition = 0x80000 / 512,
.filesystem = FS_RAW,
.commandline_append = " rootfstype=jffs2 " \
"root=/dev/mtdblock6",
"root=/dev/mtdblock6 ",
},
},
};

6
qiboot/src/cpu/s3c6410/gta03-steppingstone.c
View File

@@ -57,6 +57,8 @@ const struct board_api board_api_gta03 = {
.is_this_board = is_this_board_gta03,
.port_init = port_init_gta03,
.putc = putc_gta03,
.noboot = "boot/noboot-GTA03",
.append = "boot/append-GTA03",
.commandline_board = "console=ttySAC3,115200 " \
"init=/bin/sh " \
"loglevel=8 ",
@@ -67,7 +69,7 @@ const struct board_api board_api_gta03 = {
.filesystem = FS_EXT2,
.partition_index = 2,
.filepath = "boot/uImage-GTA03.bin",
.commandline_append = "root=/dev/mmcblk0p2",
.commandline_append = "root=/dev/mmcblk0p2 ",
},
[1] = {
.name = "SD Card backup rootfs",
@@ -75,7 +77,7 @@ const struct board_api board_api_gta03 = {
.filesystem = FS_EXT2,
.partition_index = 3,
.filepath = "boot/uImage-GTA03.bin",
.commandline_append = "root=/dev/mmcblk0p3",
.commandline_append = "root=/dev/mmcblk0p3 ",
},
},
};

12
qiboot/src/cpu/s3c6410/smdk6410-steppingstone.c
View File

@@ -47,23 +47,25 @@ const struct board_api board_api_smdk6410 = {
.putc = putc_smdk6410,
.commandline_board = "console=ttySAC0,115200 " \
"loglevel=3 " \
"init=/bin/sh",
"init=/bin/sh ",
.noboot = "boot/noboot-SDMK6410",
.append = "boot/append-SMDK6410",
.kernel_source = {
[0] = {
.name = "SD Card rootfs",
.block_read = sd_card_block_read_smdk6410,
.filesystem = FS_EXT2,
.partition_index = 2,
.filepath = "boot/uImage.bin",
.commandline_append = " root=/dev/mmcblk0p2"
.filepath = "boot/uImage-SMDK6410.bin",
.commandline_append = "root=/dev/mmcblk0p2 "
},
[1] = {
.name = "SD Card backup rootfs",
.block_read = sd_card_block_read_smdk6410,
.filesystem = FS_EXT2,
.partition_index = 3,
.filepath = "boot/uImage.bin",
.commandline_append = " root=/dev/mmcblk0p3"
.filepath = "boot/uImage-SMDK6410.bin",
.commandline_append = "root=/dev/mmcblk0p3 "
},
},
};