diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2007-01-28 17:31:08 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-09 12:41:18 -0500 |
commit | 8500adc79b15fa85b403dbf04aba3497c1f80e50 (patch) | |
tree | f47ae031d448ced4906a5145318c86a9b72cbda2 /arch/powerpc/platforms/embedded6xx | |
parent | b8583f6872496cdb0145a2f642fbefff002d68cb (diff) |
[POWERPC] Update to linkstation / kurobox support
Linkstation systems capable of running mainline kernels use u-boot as a
bootloader, so, specifying a suitable kernel command is not a problem.
Don't guess. Also extend linkstation_defconfig to support the linkstation HS
model with a IT8212 IDE controller and kuroboxHD/HD-HLAN linkstation
models with a tulip ethernet chip. The latter also require a slightly
different .dts file, which is also included with this patch.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/embedded6xx')
-rw-r--r-- | arch/powerpc/platforms/embedded6xx/linkstation.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c index 61599d919ea8..3f6c4114f908 100644 --- a/arch/powerpc/platforms/embedded6xx/linkstation.c +++ b/arch/powerpc/platforms/embedded6xx/linkstation.c | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
14 | #include <linux/pci.h> | 14 | #include <linux/pci.h> |
15 | #include <linux/initrd.h> | 15 | #include <linux/initrd.h> |
16 | #include <linux/root_dev.h> | ||
17 | #include <linux/mtd/physmap.h> | 16 | #include <linux/mtd/physmap.h> |
18 | 17 | ||
19 | #include <asm/time.h> | 18 | #include <asm/time.h> |
@@ -91,17 +90,6 @@ static void __init linkstation_setup_arch(void) | |||
91 | ARRAY_SIZE(linkstation_physmap_partitions)); | 90 | ARRAY_SIZE(linkstation_physmap_partitions)); |
92 | #endif | 91 | #endif |
93 | 92 | ||
94 | #ifdef CONFIG_BLK_DEV_INITRD | ||
95 | if (initrd_start) | ||
96 | ROOT_DEV = Root_RAM0; | ||
97 | else | ||
98 | #endif | ||
99 | #ifdef CONFIG_ROOT_NFS | ||
100 | ROOT_DEV = Root_NFS; | ||
101 | #else | ||
102 | ROOT_DEV = Root_HDA1; | ||
103 | #endif | ||
104 | |||
105 | /* Lookup PCI host bridges */ | 93 | /* Lookup PCI host bridges */ |
106 | for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) | 94 | for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) |
107 | add_bridge(np); | 95 | add_bridge(np); |