summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAhmad Fatoum <ahmad@a3f.at>2020-11-28 22:39:31 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2020-12-10 10:47:15 +0100
commitd2112dabdb72bf73aa897b843c85f074e522b384 (patch)
treea650d00a837639dc036790c2fcd6f57407074a0e
parentfd904611a60bffaa3416a617c1720885d175c7a0 (diff)
downloadbarebox-d2112dabdb72bf73aa897b843c85f074e522b384.tar.gz
barebox-d2112dabdb72bf73aa897b843c85f074e522b384.tar.xz
ARM: rpi: drop no longer needed environment
The barebox PL011 driver automatically arranges for the kernel to be called with the appropriate console argument (placed in ${global.linux.bootargs.console}. There is thus no need to hard code a TTY. Indeed we shouldn't because some Raspberry Pis don't use the PL011, but the mini-uart, which is a ttyS. Signed-off-by: Ahmad Fatoum <ahmad@a3f.at> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/boards/raspberry-pi/env/init/bootargs-base3
-rw-r--r--arch/arm/configs/rpi_defconfig2
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/boards/raspberry-pi/env/init/bootargs-base b/arch/arm/boards/raspberry-pi/env/init/bootargs-base
deleted file mode 100644
index 416dc8a6f4..0000000000
--- a/arch/arm/boards/raspberry-pi/env/init/bootargs-base
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-global.linux.bootargs.base="console=ttyAMA0,115200"
diff --git a/arch/arm/configs/rpi_defconfig b/arch/arm/configs/rpi_defconfig
index dd5ca7585a..f42b8819af 100644
--- a/arch/arm/configs/rpi_defconfig
+++ b/arch/arm/configs/rpi_defconfig
@@ -23,7 +23,7 @@ CONFIG_BOOTM_OFTREE=y
CONFIG_BLSPEC=y
CONFIG_CONSOLE_ALLOW_COLOR=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/raspberry-pi/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH=""
CONFIG_CMD_DMESG=y
CONFIG_LONGHELP=y
CONFIG_CMD_IOMEM=y