From 1422f9331fa6e6200e84c86fe0f08243f816eb20 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 19 Feb 2019 00:22:58 +0000 Subject: [PATCH] config: update so everyone has BOOTDEVICENAMES --- Kernel/platform-atarist/config.h | 2 ++ Kernel/platform-coco2cart/config.h | 2 ++ Kernel/platform-dragon-mooh/config.h | 2 ++ Kernel/platform-dragon-nx32/config.h | 4 +++- Kernel/platform-genie-eg64/config.h | 2 ++ Kernel/platform-ibmpc/config.h | 2 ++ Kernel/platform-mtx/config.h | 2 ++ Kernel/platform-nascom/config.h | 2 ++ Kernel/platform-pcw8256/config.h | 2 ++ Kernel/platform-pentagon/config.h | 2 ++ Kernel/platform-rabbit2000/config.h | 2 ++ Kernel/platform-rc2014-tiny/config.h | 2 +- Kernel/platform-sc108/config.h | 2 +- Kernel/platform-sc114/config.h | 2 +- Kernel/platform-socz80/config.h | 3 +++ Kernel/platform-tc2068/config.h | 2 ++ Kernel/platform-tiny68k/config.h | 1 + Kernel/platform-trs80/config.h | 2 ++ Kernel/platform-trs80m1/config.h | 2 ++ Kernel/platform-ubee/config.h | 2 ++ Kernel/platform-v65/config.h | 2 ++ Kernel/platform-v65c816-big/config.h | 2 ++ Kernel/platform-v65c816/config.h | 2 ++ Kernel/platform-v68-banked/config.h | 2 ++ Kernel/platform-v68-softmmu/config.h | 2 ++ Kernel/platform-v68/config.h | 2 ++ Kernel/platform-v8080/config.h | 2 ++ Kernel/platform-v85/config.h | 2 ++ Kernel/platform-z280rc/config.h | 2 ++ Kernel/platform-z80pack-lite/config.h | 2 ++ Kernel/platform-z80pack/config.h | 2 ++ Kernel/platform-zx+3/config.h | 2 ++ Kernel/platform-zxdiv/config.h | 2 ++ 33 files changed, 64 insertions(+), 4 deletions(-) diff --git a/Kernel/platform-atarist/config.h b/Kernel/platform-atarist/config.h index 04fc7953..f913becb 100644 --- a/Kernel/platform-atarist/config.h +++ b/Kernel/platform-atarist/config.h @@ -33,6 +33,8 @@ /* We need a tidier way to do this from the loader */ #define CMDLINE NULL /* Location of root dev name */ +#define BOOTDEVICENAMES "hd#,fd#" + /* Device parameters */ #define NUM_DEV_TTY 3 diff --git a/Kernel/platform-coco2cart/config.h b/Kernel/platform-coco2cart/config.h index 24169c2d..bb5bbc05 100644 --- a/Kernel/platform-coco2cart/config.h +++ b/Kernel/platform-coco2cart/config.h @@ -67,3 +67,5 @@ extern unsigned int cocoswap_dev; #define CONFIG_IDE #define platform_copyright() + +#define BOOTDEVICENAMES "hd#" diff --git a/Kernel/platform-dragon-mooh/config.h b/Kernel/platform-dragon-mooh/config.h index ee58ade0..8b979170 100644 --- a/Kernel/platform-dragon-mooh/config.h +++ b/Kernel/platform-dragon-mooh/config.h @@ -86,3 +86,5 @@ extern void platform_discard(void); #define platform_copyright() + +#define BOOTDEVICENAMES "hd#,fd#" diff --git a/Kernel/platform-dragon-nx32/config.h b/Kernel/platform-dragon-nx32/config.h index f0dd64ae..7d8e34c2 100644 --- a/Kernel/platform-dragon-nx32/config.h +++ b/Kernel/platform-dragon-nx32/config.h @@ -83,4 +83,6 @@ extern void platform_discard(void); -#define platform_copyright() /* for now */ \ No newline at end of file +#define platform_copyright() /* for now */ + +#define BOOTDEVICENAMES "hd#,fd#" diff --git a/Kernel/platform-genie-eg64/config.h b/Kernel/platform-genie-eg64/config.h index 73026496..c0ace7ae 100644 --- a/Kernel/platform-genie-eg64/config.h +++ b/Kernel/platform-genie-eg64/config.h @@ -80,3 +80,5 @@ extern unsigned char vt_map_char(unsigned char); extern void platform_discard(void); #define platform_copyright() + +#define BOOTDEVICENAMES "hd#" diff --git a/Kernel/platform-ibmpc/config.h b/Kernel/platform-ibmpc/config.h index 61b41984..dbd34343 100644 --- a/Kernel/platform-ibmpc/config.h +++ b/Kernel/platform-ibmpc/config.h @@ -48,3 +48,5 @@ extern signed char vt_width, vt_height; #define TTYDEV BOOT_TTY /* Device used by kernel for messages, panics */ #define NBUFS 6 /* Number of block buffers */ #define NMOUNTS 2 /* Number of mounts at a time */ + +#define BOOTDEVICENAMES "hd#,fd#" diff --git a/Kernel/platform-mtx/config.h b/Kernel/platform-mtx/config.h index 5d9e88b5..ad2c0ccb 100644 --- a/Kernel/platform-mtx/config.h +++ b/Kernel/platform-mtx/config.h @@ -64,3 +64,5 @@ #define platform_discard() #define platform_copyright() + +#define BOOTDEVICENAMES ",fd#" diff --git a/Kernel/platform-nascom/config.h b/Kernel/platform-nascom/config.h index 8540a3dd..3e06752e 100644 --- a/Kernel/platform-nascom/config.h +++ b/Kernel/platform-nascom/config.h @@ -72,3 +72,5 @@ extern void platform_discard(void); #define platform_copyright() + +#define BOOTDEVICENAMES "hd#,fd#" diff --git a/Kernel/platform-pcw8256/config.h b/Kernel/platform-pcw8256/config.h index 666a3341..434ca6a8 100644 --- a/Kernel/platform-pcw8256/config.h +++ b/Kernel/platform-pcw8256/config.h @@ -65,3 +65,5 @@ #define platform_discard() #define platform_copyright() + +#define BOOTDEVICENAMES ",fd#" diff --git a/Kernel/platform-pentagon/config.h b/Kernel/platform-pentagon/config.h index 9c15e3b0..32a86874 100644 --- a/Kernel/platform-pentagon/config.h +++ b/Kernel/platform-pentagon/config.h @@ -72,3 +72,5 @@ /* All our pages get mapped into the top 16K bank for swapping use */ #define swap_map(x) ((uint8_t *)(x|0xC000)) + +#define BOOTDEVICENAMES "hd#,fd#" diff --git a/Kernel/platform-rabbit2000/config.h b/Kernel/platform-rabbit2000/config.h index 65a9cc48..4795a83b 100644 --- a/Kernel/platform-rabbit2000/config.h +++ b/Kernel/platform-rabbit2000/config.h @@ -58,3 +58,5 @@ #define platform_discard() #define platform_copyright() + +#define BOOTDEVICENAMES "hd#" diff --git a/Kernel/platform-rc2014-tiny/config.h b/Kernel/platform-rc2014-tiny/config.h index d9849ac9..7cd438fb 100644 --- a/Kernel/platform-rc2014-tiny/config.h +++ b/Kernel/platform-rc2014-tiny/config.h @@ -44,7 +44,7 @@ extern unsigned int swap_dev; /* We need a tidier way to do this from the loader */ #define CMDLINE NULL /* Location of root dev name */ -#define BOOTDEVICENAMES "hd#,fd,,rd" +#define BOOTDEVICENAMES "hd#" #define CONFIG_DYNAMIC_BUFPOOL /* we expand bufpool to overwrite the _DISCARD segment at boot */ #define NBUFS 4 /* Number of block buffers, keep in line with space reserved in zeta-v2.s */ diff --git a/Kernel/platform-sc108/config.h b/Kernel/platform-sc108/config.h index a219c767..1500cedc 100644 --- a/Kernel/platform-sc108/config.h +++ b/Kernel/platform-sc108/config.h @@ -44,7 +44,7 @@ extern unsigned int swap_dev; /* We need a tidier way to do this from the loader */ #define CMDLINE NULL /* Location of root dev name */ -#define BOOTDEVICENAMES "hd#,fd,,rd" +#define BOOTDEVICENAMES "hd#,fd" #define CONFIG_DYNAMIC_BUFPOOL /* we expand bufpool to overwrite the _DISCARD segment at boot */ #define NBUFS 4 /* Number of block buffers, keep in line with space reserved in zeta-v2.s */ diff --git a/Kernel/platform-sc114/config.h b/Kernel/platform-sc114/config.h index 0e6957db..65257d7b 100644 --- a/Kernel/platform-sc114/config.h +++ b/Kernel/platform-sc114/config.h @@ -46,7 +46,7 @@ extern unsigned int swap_dev; /* We need a tidier way to do this from the loader */ #define CMDLINE NULL /* Location of root dev name */ -#define BOOTDEVICENAMES "hd#,fd,,rd" +#define BOOTDEVICENAMES "hd#,fd" #define CONFIG_DYNAMIC_BUFPOOL /* we expand bufpool to overwrite the _DISCARD segment at boot */ #define NBUFS 4 /* Number of block buffers, keep in line with space reserved in zeta-v2.s */ diff --git a/Kernel/platform-socz80/config.h b/Kernel/platform-socz80/config.h index ffb76ac5..7be01287 100644 --- a/Kernel/platform-socz80/config.h +++ b/Kernel/platform-socz80/config.h @@ -42,3 +42,6 @@ #define platform_discard() #define platform_copyright() + +#define BOOTDEVICENAMES "hd#" + diff --git a/Kernel/platform-tc2068/config.h b/Kernel/platform-tc2068/config.h index fc3d390e..409ca361 100644 --- a/Kernel/platform-tc2068/config.h +++ b/Kernel/platform-tc2068/config.h @@ -72,3 +72,5 @@ /* We swap by hitting the user map */ #define swap_map(x) ((uint8_t *)(x)) + +#define BOOTDEVICENAMES "hd#" diff --git a/Kernel/platform-tiny68k/config.h b/Kernel/platform-tiny68k/config.h index e93cbb89..b107fd7f 100644 --- a/Kernel/platform-tiny68k/config.h +++ b/Kernel/platform-tiny68k/config.h @@ -54,3 +54,4 @@ #define OFTSIZE 160 #define ITABSIZE 176 +#define BOOTDEVICENAMES "hd#" diff --git a/Kernel/platform-trs80/config.h b/Kernel/platform-trs80/config.h index 03fccad3..dc71a0a5 100644 --- a/Kernel/platform-trs80/config.h +++ b/Kernel/platform-trs80/config.h @@ -69,3 +69,5 @@ extern void platform_discard(void); #define platform_copyright() + +#define BOOTDEVICENAMES "hd#,fd#" diff --git a/Kernel/platform-trs80m1/config.h b/Kernel/platform-trs80m1/config.h index 4c23ed83..dd5793e3 100644 --- a/Kernel/platform-trs80m1/config.h +++ b/Kernel/platform-trs80m1/config.h @@ -79,3 +79,5 @@ extern void platform_discard(void); #define platform_copyright() + +#define BOOTDEVICENAMES "hd#,fd#" diff --git a/Kernel/platform-ubee/config.h b/Kernel/platform-ubee/config.h index dc761df1..a7791202 100644 --- a/Kernel/platform-ubee/config.h +++ b/Kernel/platform-ubee/config.h @@ -67,3 +67,5 @@ extern unsigned int swap_dev; #define platform_copyright() + +#define BOOTDEVICENAMES "hd#,fd#" diff --git a/Kernel/platform-v65/config.h b/Kernel/platform-v65/config.h index 7c534069..61ea38c3 100644 --- a/Kernel/platform-v65/config.h +++ b/Kernel/platform-v65/config.h @@ -44,3 +44,5 @@ #define platform_discard() #define platform_copyright() + +#define BOOTDEVICENAMES "hd#" diff --git a/Kernel/platform-v65c816-big/config.h b/Kernel/platform-v65c816-big/config.h index 9ca98ba4..143659c6 100644 --- a/Kernel/platform-v65c816-big/config.h +++ b/Kernel/platform-v65c816-big/config.h @@ -64,3 +64,5 @@ #define ITABSIZE 176 #define platform_copyright() + +#define BOOTDEVICENAMES "hd#" diff --git a/Kernel/platform-v65c816/config.h b/Kernel/platform-v65c816/config.h index a7db2f79..cac73a0c 100644 --- a/Kernel/platform-v65c816/config.h +++ b/Kernel/platform-v65c816/config.h @@ -61,3 +61,5 @@ #define ITABSIZE 32 #define platform_copyright() + +#define BOOTDEVICENAMES "hd#" diff --git a/Kernel/platform-v68-banked/config.h b/Kernel/platform-v68-banked/config.h index 941587d0..f3982741 100644 --- a/Kernel/platform-v68-banked/config.h +++ b/Kernel/platform-v68-banked/config.h @@ -50,3 +50,5 @@ #define CONFIG_IDE #define platform_copyright() + +#define BOOTDEVICENAMES "hd#" diff --git a/Kernel/platform-v68-softmmu/config.h b/Kernel/platform-v68-softmmu/config.h index 6838b646..a622a7d0 100644 --- a/Kernel/platform-v68-softmmu/config.h +++ b/Kernel/platform-v68-softmmu/config.h @@ -32,3 +32,5 @@ #define MAX_BLKDEV 4 #define platform_copyright() + +#definbe BOOTDEVICENAMES "hd#" diff --git a/Kernel/platform-v68/config.h b/Kernel/platform-v68/config.h index 1853f4a7..f15df033 100644 --- a/Kernel/platform-v68/config.h +++ b/Kernel/platform-v68/config.h @@ -47,3 +47,5 @@ #define CONFIG_IDE #define platform_copyright() + +#define BOOTDEVICENAMES "hd#" diff --git a/Kernel/platform-v8080/config.h b/Kernel/platform-v8080/config.h index 948290af..e79a70d8 100644 --- a/Kernel/platform-v8080/config.h +++ b/Kernel/platform-v8080/config.h @@ -53,3 +53,5 @@ #define platform_discard() #define platform_copyright() + +#define BOOTDEVICENAMES "hd#" diff --git a/Kernel/platform-v85/config.h b/Kernel/platform-v85/config.h index 791c2938..f8595bb3 100644 --- a/Kernel/platform-v85/config.h +++ b/Kernel/platform-v85/config.h @@ -62,3 +62,5 @@ #define platform_discard() #define platform_copyright() + +#define BOOTDEVICENAMES "hd#" diff --git a/Kernel/platform-z280rc/config.h b/Kernel/platform-z280rc/config.h index 6903e3a4..149ae87a 100644 --- a/Kernel/platform-z280rc/config.h +++ b/Kernel/platform-z280rc/config.h @@ -122,3 +122,5 @@ extern unsigned int swap_dev; #define TTY_INIT_BAUD B38400 /* To match ROMWBW */ #define platform_copyright() + +#define BOOTDEVICENAMES "hd#" diff --git a/Kernel/platform-z80pack-lite/config.h b/Kernel/platform-z80pack-lite/config.h index a11ea7cd..23f1985e 100644 --- a/Kernel/platform-z80pack-lite/config.h +++ b/Kernel/platform-z80pack-lite/config.h @@ -36,3 +36,5 @@ #define platform_discard() #define platform_copyright() + +#define BOOTDEVICENAMES "hd#,fd#" diff --git a/Kernel/platform-z80pack/config.h b/Kernel/platform-z80pack/config.h index 38d2d4db..ee591450 100644 --- a/Kernel/platform-z80pack/config.h +++ b/Kernel/platform-z80pack/config.h @@ -57,3 +57,5 @@ #define platform_discard() #define platform_copyright() + +#define BOOTDEVICENNAMES "hd#,fd#" diff --git a/Kernel/platform-zx+3/config.h b/Kernel/platform-zx+3/config.h index 05995407..8b903123 100644 --- a/Kernel/platform-zx+3/config.h +++ b/Kernel/platform-zx+3/config.h @@ -74,3 +74,5 @@ /* We swap by hitting the user map */ #define swap_map(x) ((uint8_t *)(x)) + +#define BOOTDEVICENAMES "hd#,fd#" diff --git a/Kernel/platform-zxdiv/config.h b/Kernel/platform-zxdiv/config.h index 00b862f4..aad3c7e5 100644 --- a/Kernel/platform-zxdiv/config.h +++ b/Kernel/platform-zxdiv/config.h @@ -73,3 +73,5 @@ /* All our pages get mapped into the top 16K bank for swapping use */ #define swap_map(x) ((uint8_t *)(x|0xC000)) + +#define BOOTDEVICENAMES "hd#" -- 2.34.1