From 6ec7f539ec97dcb3224f8176823c2b8221a3a814 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Sat, 7 May 2016 22:18:29 -0500
Subject: [PATCH] sdcard: make cape_universal configable
fixes: https://github.com/beagleboard/image-builder/pull/12
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
publish/bb.org_4gb_stable.sh | 2 +-
publish/rcn-ee_bb.org-stable.sh | 4 ++--
publish/rcn-ee_bb.org-test.sh | 8 ++++----
publish/rcn-ee_elinux.sh | 2 +-
tools/setup_sdcard.sh | 5 ++++-
5 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/publish/bb.org_4gb_stable.sh b/publish/bb.org_4gb_stable.sh
index 85bb6de30..400c05d82 100755
--- a/publish/bb.org_4gb_stable.sh
+++ b/publish/bb.org_4gb_stable.sh
@@ -69,7 +69,7 @@ echo "pid: [${KEEP_NET_ALIVE_PID}]"
image_name="debian-8.4-iot-armhf-${time}"
size="2gb"
options="--img-2gb bone-${image_name} --dtb beaglebone \
---bbb-old-bootloader-in-emmc --hostname beaglebone"
+--bbb-old-bootloader-in-emmc --hostname beaglebone --enable-cape-universal"
./RootStock-NG.sh -c bb.org-debian-jessie-iot-v4.1
build_and_upload_image
diff --git a/publish/rcn-ee_bb.org-stable.sh b/publish/rcn-ee_bb.org-stable.sh
index d34b4f1d8..a37b4b1a8 100755
--- a/publish/rcn-ee_bb.org-stable.sh
+++ b/publish/rcn-ee_bb.org-stable.sh
@@ -35,10 +35,10 @@ debian_jessie_seeed_iot="debian-8.4-seeed-iot-armhf-${time}"
archive="xz -z -8"
beaglebone="--dtb beaglebone --bbb-old-bootloader-in-emmc \
---rootfs_label rootfs --hostname beaglebone"
+--rootfs_label rootfs --hostname beaglebone --enable-cape-universal"
bb_blank_flasher="--dtb beaglebone --bbb-old-bootloader-in-emmc \
---rootfs_label rootfs --hostname beaglebone"
+--rootfs_label rootfs --hostname beaglebone --enable-cape-universal"
arduino_tre="--dtb am335x-arduino-tre --boot_label ARDUINO-TRE \
--rootfs_label rootfs --hostname arduino-tre"
diff --git a/publish/rcn-ee_bb.org-test.sh b/publish/rcn-ee_bb.org-test.sh
index d63962081..1c47df7dc 100755
--- a/publish/rcn-ee_bb.org-test.sh
+++ b/publish/rcn-ee_bb.org-test.sh
@@ -26,16 +26,16 @@ debian_jessie_usbflasher="debian-8.4-usbflasher-armhf-${time}"
archive="xz -z -8"
-beaglebone="--dtb beaglebone --bbb-old-bootloader-in-emmc --hostname beaglebone"
+beaglebone="--dtb beaglebone --bbb-old-bootloader-in-emmc --hostname beaglebone --enable-cape-universal"
bb_blank_flasher="--dtb bbb-blank-eeprom --bbb-old-bootloader-in-emmc \
---hostname beaglebone"
+--hostname beaglebone --enable-cape-universal"
beaglebone_console="--dtb beaglebone --bbb-old-bootloader-in-emmc \
---hostname beaglebone"
+--hostname beaglebone --enable-cape-universal"
bb_blank_flasher_console="--dtb bbb-blank-eeprom --bbb-old-bootloader-in-emmc \
---hostname beaglebone"
+--hostname beaglebone --enable-cape-universal"
arduino_tre="--dtb am335x-arduino-tre --boot_label ARDUINO-TRE \
--rootfs_label rootfs --hostname arduino-tre"
diff --git a/publish/rcn-ee_elinux.sh b/publish/rcn-ee_elinux.sh
index cd2371551..ff89fb018 100755
--- a/publish/rcn-ee_elinux.sh
+++ b/publish/rcn-ee_elinux.sh
@@ -22,7 +22,7 @@ ubuntu_stable="ubuntu-16.04-console-armhf-${time}"
archive="xz -z -8"
beaglebone="--dtb beaglebone --bbb-old-bootloader-in-emmc \
---rootfs_label rootfs"
+--rootfs_label rootfs --enable-cape-universal"
omap3_beagle_xm="--dtb omap3-beagle-xm --rootfs_label rootfs"
omap5_uevm="--dtb omap5-uevm --rootfs_label rootfs"
diff --git a/tools/setup_sdcard.sh b/tools/setup_sdcard.sh
index e9b65efee..1ccc95c29 100755
--- a/tools/setup_sdcard.sh
+++ b/tools/setup_sdcard.sh
@@ -1128,7 +1128,7 @@ populate_rootfs () {
cmdline="${cmdline} init=/lib/systemd/systemd"
fi
- if [ "x${conf_board}" = "xam335x_boneblack" ] || [ "x${conf_board}" = "xam335x_evm" ] ; then
+ if [ "x${enable_cape_universal}" = "xenable" ] ; then
cmdline="${cmdline} cape_universal=enable"
fi
@@ -1712,6 +1712,9 @@ while [ ! -z "$1" ] ; do
--enable-systemd)
enable_systemd="enabled"
;;
+ --enable-cape-universal)
+ enable_cape_universal="enable"
+ ;;
--offline)
offline=1
;;
--
GitLab