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

Commit e60c526f authored by David Gibson's avatar David Gibson Committed by Paul Mackerras
Browse files

[POWERPC] Don't store a command line in the Holly device tree



Currently, the Holly device tree includes a bootargs property in
/chosen, which gives a commandline.  This is somewhat inconvenient,
because it means an alternative default command line can't be given in
the kernel config - the value obtained from the dts via the
bootwrapper will always override CONFIG_CMDLINE.

This removes the command line from the dts, and instead puts the
same command line as a default in holly_defconfig.

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 85aecac8
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -193,6 +193,5 @@

	chosen {
		linux,stdout-path = "/tsi109@c0000000/serial@7808";
		bootargs = "console=ttyS0,115200";
	};
};
+2 −1
Original line number Diff line number Diff line
@@ -182,7 +182,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_RESOURCES_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1
CONFIG_PROC_DEVICETREE=y
# CONFIG_CMDLINE_BOOL is not set
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="console=ttyS0,115200"
# CONFIG_PM is not set
# CONFIG_SECCOMP is not set
# CONFIG_WANT_DEVICE_TREE is not set