Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 745e1027 authored Oct 11, 2007 by Grant Likely Committed by Paul Mackerras Oct 11, 2007

[POWERPC] Platforms shouldn't mess with ROOT_DEV



There is no good reason for board platform code to mess with the
ROOT_DEV.  Remove it from all in-tree platforms except powermac.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>

parent d27c1ced

arch/powerpc/platforms/52xx/efika.c

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -197,15 +197,6 @@ static void __init efika_setup_arch(void)
	{		{
	rtas_initialize();		rtas_initialize();

	#ifdef CONFIG_BLK_DEV_INITRD
	initrd_below_start_ok = 1;

	if (initrd_start)
	ROOT_DEV = Root_RAM0;
	else
	#endif
	ROOT_DEV = Root_SDA2; /* sda2 (sda1 is for the kernel) */

	efika_pcisetup();		efika_pcisetup();

	#ifdef CONFIG_PM		#ifdef CONFIG_PM

arch/powerpc/platforms/cell/setup.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -171,11 +171,6 @@ static void __init cell_setup_arch(void)
	/* init to some ~sane value until calibrate_delay() runs */		/* init to some ~sane value until calibrate_delay() runs */
	loops_per_jiffy = 50000000;		loops_per_jiffy = 50000000;

	if (ROOT_DEV == 0) {
	printk("No ramdisk, default root is /dev/hda2\n");
	ROOT_DEV = Root_HDA2;
	}

	/* Find and initialize PCI host bridges */		/* Find and initialize PCI host bridges */
	init_pci_config_tokens();		init_pci_config_tokens();
	find_and_init_phbs();		find_and_init_phbs();

arch/powerpc/platforms/celleb/setup.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -101,11 +101,6 @@ static void __init celleb_setup_arch(void)
	/* init to some ~sane value until calibrate_delay() runs */		/* init to some ~sane value until calibrate_delay() runs */
	loops_per_jiffy = 50000000;		loops_per_jiffy = 50000000;

	if (ROOT_DEV == 0) {
	printk("No ramdisk, default root is /dev/hda2\n");
	ROOT_DEV = Root_HDA2;
	}

	#ifdef CONFIG_DUMMY_CONSOLE		#ifdef CONFIG_DUMMY_CONSOLE
	conswitchp = &dummy_con;		conswitchp = &dummy_con;
	#endif		#endif

arch/powerpc/platforms/chrp/setup.c

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -290,16 +290,6 @@ void __init chrp_setup_arch(void)
	ppc_md.set_rtc_time = rtas_set_rtc_time;		ppc_md.set_rtc_time = rtas_set_rtc_time;
	}		}

	#ifdef CONFIG_BLK_DEV_INITRD
	/* this is fine for chrp */
	initrd_below_start_ok = 1;

	if (initrd_start)
	ROOT_DEV = Root_RAM0;
	else
	#endif
	ROOT_DEV = Root_SDA2; /* sda2 (sda1 is for the kernel) */

	/* On pegasos, enable the L2 cache if not already done by OF */		/* On pegasos, enable the L2 cache if not already done by OF */
	pegasos_set_l2cr();		pegasos_set_l2cr();

arch/powerpc/platforms/pseries/setup.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -257,11 +257,6 @@ static void __init pSeries_setup_arch(void)
	/* init to some ~sane value until calibrate_delay() runs */		/* init to some ~sane value until calibrate_delay() runs */
	loops_per_jiffy = 50000000;		loops_per_jiffy = 50000000;

	if (ROOT_DEV == 0) {
	printk("No ramdisk, default root is /dev/sda2\n");
	ROOT_DEV = Root_SDA2;
	}

	fwnmi_init();		fwnmi_init();

	/* Find and initialize PCI host bridges */		/* Find and initialize PCI host bridges */