omap: work around ti mmcargs rewrite in u-boot

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/62/head
Robert Nelson 9 years ago
parent 9f870d8c8c
commit 40d3d526cc

@ -31,6 +31,7 @@ boot_name="u-boot.img"
#Bootloader: u-boot features: #Bootloader: u-boot features:
conf_smart_uboot="enable" conf_smart_uboot="enable"
conf_netinstall_enable="enable"
#Kernel: #Kernel:
#https://rcn-ee.com/repos/deb/wheezy-armhf/LATEST-armv7 #https://rcn-ee.com/repos/deb/wheezy-armhf/LATEST-armv7

@ -31,6 +31,7 @@ boot_name="u-boot.img"
#Bootloader: u-boot features: #Bootloader: u-boot features:
conf_smart_uboot="enable" conf_smart_uboot="enable"
conf_netinstall_enable="enable"
#Kernel: #Kernel:
#https://rcn-ee.com/repos/deb/wheezy-armhf/LATEST-armv7 #https://rcn-ee.com/repos/deb/wheezy-armhf/LATEST-armv7

@ -31,6 +31,7 @@ boot_name="u-boot.img"
#Bootloader: u-boot features: #Bootloader: u-boot features:
conf_smart_uboot="enable" conf_smart_uboot="enable"
conf_netinstall_enable="enable"
#Kernel: #Kernel:
#https://rcn-ee.com/repos/deb/wheezy-armhf/LATEST-armv7 #https://rcn-ee.com/repos/deb/wheezy-armhf/LATEST-armv7

@ -31,6 +31,7 @@ boot_name="u-boot.img"
#Bootloader: u-boot features: #Bootloader: u-boot features:
conf_smart_uboot="enable" conf_smart_uboot="enable"
conf_netinstall_enable="enable"
#Kernel: #Kernel:
#https://rcn-ee.com/repos/deb/wheezy-armhf/LATEST-armv7 #https://rcn-ee.com/repos/deb/wheezy-armhf/LATEST-armv7

@ -1166,22 +1166,32 @@ populate_boot () {
if [ "x${di_serial_mode}" = "xenable" ] ; then if [ "x${di_serial_mode}" = "xenable" ] ; then
echo "message=echo; echo Installer for [${DISTARCH}] is using the Serial Interface; echo;" >> "${wfile}" echo "message=echo; echo Installer for [${DISTARCH}] is using the Serial Interface; echo;" >> "${wfile}"
mmcargs="${mmcargs}=${SERIAL_CONSOLE} root=/dev/ram0 rw" mmcargs="${mmcargs}=${SERIAL_CONSOLE} root=/dev/ram0 rw"
netinstall_bootargs="console=${SERIAL_CONSOLE}"
else else
echo "message=echo; echo Installer for [${DISTARCH}] is using the Video Interface; echo Use [--serial-mode] to force Installing over the Serial Interface; echo;" >> "${wfile}" echo "message=echo; echo Installer for [${DISTARCH}] is using the Video Interface; echo Use [--serial-mode] to force Installing over the Serial Interface; echo;" >> "${wfile}"
mmcargs="${mmcargs}=tty0 root=/dev/ram0 rw" mmcargs="${mmcargs}=tty0 root=/dev/ram0 rw"
netinstall_bootargs="console=tty0"
fi fi
if [ "x${drm_read_edid_broken}" = "xenable" ] ; then if [ "x${drm_read_edid_broken}" = "xenable" ] ; then
mmcargs="${mmcargs} video=${drm_device_identifier}:1024x768@60e" mmcargs="${mmcargs} video=${drm_device_identifier}:1024x768@60e"
netinstall_bootargs="${netinstall_bootargs} video=${drm_device_identifier}:1024x768@60e"
fi fi
if [ ! "x${cmdline}" = "x" ] ; then if [ ! "x${cmdline}" = "x" ] ; then
mmcargs="${mmcargs} ${cmdline}" mmcargs="${mmcargs} ${cmdline}"
fi fi
if [ "x${conf_netinstall_enable}" = "xenable" ] ; then
echo "netinstall_enable=enable" >> "${wfile}"
echo "netinstall_bootargs=${netinstall_bootargs}" >> "${wfile}"
echo "cmdline=${cmdline}" >> "${wfile}"
else
echo "${mmcargs}" >> "${wfile}" echo "${mmcargs}" >> "${wfile}"
fi
echo "Net Install Boot Script:" echo "Net Install Boot Script:"
echo "-----------------------------"
cat "${wfile}" cat "${wfile}"
echo "-----------------------------" echo "-----------------------------"
@ -1335,7 +1345,7 @@ process_dtb_conf () {
sfdisk_fstype="0xE" sfdisk_fstype="0xE"
;; ;;
ext2|ext3|ext4) ext2|ext3|ext4)
sfdisk_fstype="0x83" sfdisk_fstype="L"
;; ;;
*) *)
echo "Error: [conf_boot_fstype] not recognized, stopping..." echo "Error: [conf_boot_fstype] not recognized, stopping..."

Loading…
Cancel
Save