From 26f5cf36862014ee9975ebe846ed8eae0498a6de Mon Sep 17 00:00:00 2001 From: Chris Fiege Date: Mon, 3 Jul 2017 16:05:41 +0200 Subject: platform-v7a: am335x: create own barebox defaultenv Using this change the barebox-am335x package has its own defaultenv directory. Signed-off-by: Chris Fiege --- configs/platform-v7a/barebox-am335x-defaultenv/boot/9p | 10 ++++++++++ .../platform-v7a/barebox-am335x-defaultenv/boot/bootchoser | 3 +++ .../platform-v7a/barebox-am335x-defaultenv/init/bootsource | 13 +++++++++++++ .../barebox-am335x-defaultenv/nv/bootstate.system0.priority | 1 + .../barebox-am335x-defaultenv/nv/bootstate.system1.priority | 1 + .../barebox-am335x-defaultenv/nv/linux.bootargs.console | 1 + configs/platform-v7a/barebox-am335x.config | 2 +- 7 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 configs/platform-v7a/barebox-am335x-defaultenv/boot/9p create mode 100644 configs/platform-v7a/barebox-am335x-defaultenv/boot/bootchoser create mode 100644 configs/platform-v7a/barebox-am335x-defaultenv/init/bootsource create mode 100644 configs/platform-v7a/barebox-am335x-defaultenv/nv/bootstate.system0.priority create mode 100644 configs/platform-v7a/barebox-am335x-defaultenv/nv/bootstate.system1.priority create mode 100644 configs/platform-v7a/barebox-am335x-defaultenv/nv/linux.bootargs.console (limited to 'configs/platform-v7a') diff --git a/configs/platform-v7a/barebox-am335x-defaultenv/boot/9p b/configs/platform-v7a/barebox-am335x-defaultenv/boot/9p new file mode 100644 index 0000000..264ffec --- /dev/null +++ b/configs/platform-v7a/barebox-am335x-defaultenv/boot/9p @@ -0,0 +1,10 @@ +#!/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-am335x-defaultenv/boot/bootchoser b/configs/platform-v7a/barebox-am335x-defaultenv/boot/bootchoser new file mode 100644 index 0000000..3b2e19a --- /dev/null +++ b/configs/platform-v7a/barebox-am335x-defaultenv/boot/bootchoser @@ -0,0 +1,3 @@ +#!/bin/sh + +bootchoser -d diff --git a/configs/platform-v7a/barebox-am335x-defaultenv/init/bootsource b/configs/platform-v7a/barebox-am335x-defaultenv/init/bootsource new file mode 100644 index 0000000..4de7163 --- /dev/null +++ b/configs/platform-v7a/barebox-am335x-defaultenv/init/bootsource @@ -0,0 +1,13 @@ +#!/bin/sh + +if [ -n "$nv.boot.default" ]; then + exit +fi + +if [ $bootsource = mmc ]; then + global.boot.default="bootchooser net" +elif [ $bootsource = net ]; then + global.boot.default="net bootchooser" +else + global.boot.default="disk0.1 net" +fi diff --git a/configs/platform-v7a/barebox-am335x-defaultenv/nv/bootstate.system0.priority b/configs/platform-v7a/barebox-am335x-defaultenv/nv/bootstate.system0.priority new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/configs/platform-v7a/barebox-am335x-defaultenv/nv/bootstate.system0.priority @@ -0,0 +1 @@ +10 diff --git a/configs/platform-v7a/barebox-am335x-defaultenv/nv/bootstate.system1.priority b/configs/platform-v7a/barebox-am335x-defaultenv/nv/bootstate.system1.priority new file mode 100644 index 0000000..209e3ef --- /dev/null +++ b/configs/platform-v7a/barebox-am335x-defaultenv/nv/bootstate.system1.priority @@ -0,0 +1 @@ +20 diff --git a/configs/platform-v7a/barebox-am335x-defaultenv/nv/linux.bootargs.console b/configs/platform-v7a/barebox-am335x-defaultenv/nv/linux.bootargs.console new file mode 100644 index 0000000..705752c --- /dev/null +++ b/configs/platform-v7a/barebox-am335x-defaultenv/nv/linux.bootargs.console @@ -0,0 +1 @@ +loglevel=5 systemd.log_level=warning systemd.show_status=auto diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config index f32da9b..b11e6ed 100644 --- a/configs/platform-v7a/barebox-am335x.config +++ b/configs/platform-v7a/barebox-am335x.config @@ -191,7 +191,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_COMPRESSION_NONE=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y -CONFIG_DEFAULT_ENVIRONMENT_PATH=" .ptxdist-defaultenv .ptxdist-defaultenv .ptxdist-defaultenv" +CONFIG_DEFAULT_ENVIRONMENT_PATH="${PTXDIST_PLATFORMCONFIGDIR}/barebox-am335x-defaultenv" # CONFIG_BAREBOXENV_TARGET is not set # CONFIG_BAREBOXCRC32_TARGET is not set CONFIG_POLLER=y -- cgit v1.2.3