From 5d2498919c21c8157e77b79ab6e03c1d793c362a Mon Sep 17 00:00:00 2001 From: Roland Hieber Date: Mon, 26 Apr 2021 08:05:24 +0200 Subject: v7a: barebox: clean up defaultenvs * The 9p bootsource is only available for qemu-vexpress * The bootstate entries were never evaluated because the system0 and system1 partitions were never set up on any boards Remove all unneeded variables to keep the defaultenvs lean. Fixes: ef189b9c3e0c9e3fed89 (2017-07-03, "platform-v7a: rpi2: create own rpi2 barebox defaultenv") Fixes: 785275ccb99d60da8abb (2017-07-03, "platform-v72: mx6: create own mx6 barebox defaultenv") Fixes: 26f5cf36862014ee9975 (2017-07-03, "platform-v7a: am335x: create own barebox defaultenv") Signed-off-by: Roland Hieber Link: https://lore.pengutronix.de/20210426060526.32029-3-rhi@pengutronix.de Signed-off-by: Robert Schwebel --- configs/platform-v7a/barebox-am335x-defaultenv/boot/9p | 10 ---------- configs/platform-v7a/barebox-mx6-defaultenv/boot/9p | 10 ---------- configs/platform-v7a/barebox-rpi2-defaultenv/boot/9p | 10 ---------- .../barebox-rpi2-defaultenv/nv/bootstate.system0.priority | 1 - .../barebox-rpi2-defaultenv/nv/bootstate.system1.priority | 1 - 5 files changed, 32 deletions(-) delete mode 100644 configs/platform-v7a/barebox-am335x-defaultenv/boot/9p delete mode 100644 configs/platform-v7a/barebox-mx6-defaultenv/boot/9p delete mode 100644 configs/platform-v7a/barebox-rpi2-defaultenv/boot/9p delete mode 100644 configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootstate.system0.priority delete mode 100644 configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootstate.system1.priority (limited to 'configs') diff --git a/configs/platform-v7a/barebox-am335x-defaultenv/boot/9p b/configs/platform-v7a/barebox-am335x-defaultenv/boot/9p deleted file mode 100644 index 264ffec..0000000 --- a/configs/platform-v7a/barebox-am335x-defaultenv/boot/9p +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -addpart /dev/nor0 "8M@32M(kernel)" -addpart /dev/nor0 "512k@40M(dtb)" -global.bootm.image="/dev/nor0.kernel" -global.bootm.oftree="/dev/nor0.dtb" - -global linux.bootargs.base="console=ttyAMA0,115200 loglevel=5 ptxdist-devel" - -global linux.bootargs.root="root=/dev/root rootfstype=9p rootflags=trans=virtio" \ No newline at end of file diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/boot/9p b/configs/platform-v7a/barebox-mx6-defaultenv/boot/9p deleted file mode 100644 index 264ffec..0000000 --- a/configs/platform-v7a/barebox-mx6-defaultenv/boot/9p +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -addpart /dev/nor0 "8M@32M(kernel)" -addpart /dev/nor0 "512k@40M(dtb)" -global.bootm.image="/dev/nor0.kernel" -global.bootm.oftree="/dev/nor0.dtb" - -global linux.bootargs.base="console=ttyAMA0,115200 loglevel=5 ptxdist-devel" - -global linux.bootargs.root="root=/dev/root rootfstype=9p rootflags=trans=virtio" \ No newline at end of file diff --git a/configs/platform-v7a/barebox-rpi2-defaultenv/boot/9p b/configs/platform-v7a/barebox-rpi2-defaultenv/boot/9p deleted file mode 100644 index 264ffec..0000000 --- a/configs/platform-v7a/barebox-rpi2-defaultenv/boot/9p +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -addpart /dev/nor0 "8M@32M(kernel)" -addpart /dev/nor0 "512k@40M(dtb)" -global.bootm.image="/dev/nor0.kernel" -global.bootm.oftree="/dev/nor0.dtb" - -global linux.bootargs.base="console=ttyAMA0,115200 loglevel=5 ptxdist-devel" - -global linux.bootargs.root="root=/dev/root rootfstype=9p rootflags=trans=virtio" \ No newline at end of file diff --git a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootstate.system0.priority b/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootstate.system0.priority deleted file mode 100644 index f599e28..0000000 --- a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootstate.system0.priority +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootstate.system1.priority b/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootstate.system1.priority deleted file mode 100644 index 209e3ef..0000000 --- a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootstate.system1.priority +++ /dev/null @@ -1 +0,0 @@ -20 -- cgit v1.2.3