cleanup: simplfiy CONFIG_SUPPORT_RAW_INITRD

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/22/head
Robert Nelson 12 years ago
parent b921efb91b
commit a857a6dc70

@ -17,6 +17,9 @@ boot_name="u-boot.img"
#CONFIG_CMD_BOOTZ
#bootz & zImage
conf_uboot_CONFIG_CMD_BOOTZ=1
#CONFIG_SUPPORT_RAW_INITRD
#allows booting un-mkimage wrapped initrds
#conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#Bootloader: u-boot settings
boot_script="uEnv.txt"
@ -26,13 +29,6 @@ uboot_CMD_LOAD="load"
uboot_USE_MMC_DEFINES=1
uboot_fdt_auto_detection=1
#if: define CONFIG_SUPPORT_RAW_INITRD
#conf_normal_initrd_file=initrd.img
#conf_net_initrd_file=initrd.net
##otherwise:
conf_normal_initrd_file=uInitrd
conf_net_initrd_file=uInitrd.net
#Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp
kernel_subarch="omap-psp"

@ -17,6 +17,9 @@ boot_name="u-boot.img"
#CONFIG_CMD_BOOTZ
#bootz & zImage
conf_uboot_CONFIG_CMD_BOOTZ=1
#CONFIG_SUPPORT_RAW_INITRD
#allows booting un-mkimage wrapped initrds
#conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#Bootloader: u-boot settings
boot_script="uEnv.txt"
@ -26,13 +29,6 @@ uboot_CMD_LOAD="load"
uboot_USE_MMC_DEFINES=1
uboot_fdt_auto_detection=1
#if: define CONFIG_SUPPORT_RAW_INITRD
#conf_normal_initrd_file=initrd.img
#conf_net_initrd_file=initrd.net
##otherwise:
conf_normal_initrd_file=uInitrd
conf_net_initrd_file=uInitrd.net
#Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp
kernel_subarch="omap-psp"

@ -17,6 +17,9 @@ boot_name="u-boot.img"
#CONFIG_CMD_BOOTZ
#bootz & zImage
conf_uboot_CONFIG_CMD_BOOTZ=1
#CONFIG_SUPPORT_RAW_INITRD
#allows booting un-mkimage wrapped initrds
#conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#Bootloader: u-boot settings
boot_script="uEnv.txt"
@ -26,13 +29,6 @@ uboot_CMD_LOAD="load"
uboot_USE_MMC_DEFINES=1
uboot_fdt_auto_detection=1
#if: define CONFIG_SUPPORT_RAW_INITRD
#conf_normal_initrd_file=initrd.img
#conf_net_initrd_file=initrd.net
##otherwise:
conf_normal_initrd_file=uInitrd
conf_net_initrd_file=uInitrd.net
#Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp
kernel_subarch="omap-psp"

@ -31,6 +31,9 @@ boot_name="u-boot.img"
#CONFIG_CMD_BOOTZ
#bootz & zImage
conf_uboot_CONFIG_CMD_BOOTZ=1
#CONFIG_SUPPORT_RAW_INITRD
#allows booting un-mkimage wrapped initrds
conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#Bootloader: u-boot settings
boot_script="uEnv.txt"
@ -58,13 +61,6 @@ uboot_USE_MMC_DEFINES=1
uboot_SCRIPT_ENTRY="uenvcmd"
uboot_CMD_LOAD="fatload"
#if: define CONFIG_SUPPORT_RAW_INITRD
conf_normal_initrd_file=initrd.img
conf_net_initrd_file=initrd.net
##otherwise:
#conf_normal_initrd_file=uInitrd
#conf_net_initrd_file=uInitrd.net
[(4) Kernel Setup]
[Raw Deb file or:]
[ABI:1 STABLE http://rcn-ee.net/deb/wheezy-armhf/v3.7.4-x8/install-me.sh]

@ -22,6 +22,9 @@ boot_name="u-boot.imx"
#CONFIG_CMD_BOOTZ
#bootz & zImage
conf_uboot_CONFIG_CMD_BOOTZ=1
#CONFIG_SUPPORT_RAW_INITRD
#allows booting un-mkimage wrapped initrds
conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#Bootloader: u-boot settings
boot_script="uEnv.txt"
@ -30,13 +33,6 @@ uboot_USE_MMC_DEFINES=1
uboot_SCRIPT_ENTRY="uenvcmd"
uboot_CMD_LOAD="load"
#if: define CONFIG_SUPPORT_RAW_INITRD
conf_normal_initrd_file=initrd.img
conf_net_initrd_file=initrd.net
##otherwise:
#conf_normal_initrd_file=uInitrd
#conf_net_initrd_file=uInitrd.net
#Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx
kernel_subarch="imx"

@ -22,6 +22,9 @@ boot_name="u-boot.imx"
#CONFIG_CMD_BOOTZ
#bootz & zImage
conf_uboot_CONFIG_CMD_BOOTZ=1
#CONFIG_SUPPORT_RAW_INITRD
#allows booting un-mkimage wrapped initrds
conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#Bootloader: u-boot settings
boot_script="uEnv.txt"
@ -30,13 +33,6 @@ uboot_USE_MMC_DEFINES=1
uboot_SCRIPT_ENTRY="uenvcmd"
uboot_CMD_LOAD="load"
#if: define CONFIG_SUPPORT_RAW_INITRD
conf_normal_initrd_file=initrd.img
conf_net_initrd_file=initrd.net
##otherwise:
#conf_normal_initrd_file=uInitrd
#conf_net_initrd_file=uInitrd.net
#Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx
kernel_subarch="imx"

@ -22,6 +22,9 @@ boot_name="u-boot.imx"
#CONFIG_CMD_BOOTZ
#bootz & zImage
conf_uboot_CONFIG_CMD_BOOTZ=1
#CONFIG_SUPPORT_RAW_INITRD
#allows booting un-mkimage wrapped initrds
conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#Bootloader: u-boot settings
boot_script="uEnv.txt"
@ -30,13 +33,6 @@ uboot_USE_MMC_DEFINES=1
uboot_SCRIPT_ENTRY="uenvcmd"
uboot_CMD_LOAD="load"
#if: define CONFIG_SUPPORT_RAW_INITRD
conf_normal_initrd_file=initrd.img
conf_net_initrd_file=initrd.net
##otherwise:
#conf_normal_initrd_file=uInitrd
#conf_net_initrd_file=uInitrd.net
#Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx
kernel_subarch="imx"

@ -20,6 +20,9 @@ boot_name="u-boot.imx"
#CONFIG_CMD_BOOTZ
#bootz & zImage
conf_uboot_CONFIG_CMD_BOOTZ=1
#CONFIG_SUPPORT_RAW_INITRD
#allows booting un-mkimage wrapped initrds
conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#Bootloader: u-boot settings
boot_script="uEnv.txt"
@ -28,13 +31,6 @@ uboot_USE_MMC_DEFINES=1
uboot_SCRIPT_ENTRY="uenvcmd"
uboot_CMD_LOAD="load"
#if: define CONFIG_SUPPORT_RAW_INITRD
conf_normal_initrd_file=initrd.img
conf_net_initrd_file=initrd.net
##otherwise:
#conf_normal_initrd_file=uInitrd
#conf_net_initrd_file=uInitrd.net
#Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx
kernel_subarch="imx"

@ -17,6 +17,9 @@ boot_name="u-boot.img"
#CONFIG_CMD_BOOTZ
#bootz & zImage
conf_uboot_CONFIG_CMD_BOOTZ=1
#CONFIG_SUPPORT_RAW_INITRD
#allows booting un-mkimage wrapped initrds
conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#Bootloader: u-boot settings
boot_script="uEnv.txt"
@ -24,13 +27,6 @@ boot_fstype="fat"
uboot_SCRIPT_ENTRY="uenvcmd"
uboot_CMD_LOAD="fatload"
#if: define CONFIG_SUPPORT_RAW_INITRD
conf_normal_initrd_file=initrd.img
conf_net_initrd_file=initrd.net
##otherwise:
#conf_normal_initrd_file=uInitrd
#conf_net_initrd_file=uInitrd.net
#Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap
kernel_subarch="omap"

@ -17,6 +17,9 @@ boot_name="u-boot.img"
#CONFIG_CMD_BOOTZ
#bootz & zImage
conf_uboot_CONFIG_CMD_BOOTZ=1
#CONFIG_SUPPORT_RAW_INITRD
#allows booting un-mkimage wrapped initrds
conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#Bootloader: u-boot settings
boot_script="uEnv.txt"
@ -24,13 +27,6 @@ boot_fstype="fat"
uboot_SCRIPT_ENTRY="uenvcmd"
uboot_CMD_LOAD="fatload"
#if: define CONFIG_SUPPORT_RAW_INITRD
conf_normal_initrd_file=initrd.img
conf_net_initrd_file=initrd.net
##otherwise:
#conf_normal_initrd_file=uInitrd
#conf_net_initrd_file=uInitrd.net
#Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap
kernel_subarch="omap"

@ -17,6 +17,9 @@ boot_name="u-boot.img"
#CONFIG_CMD_BOOTZ
#bootz & zImage
conf_uboot_CONFIG_CMD_BOOTZ=1
#CONFIG_SUPPORT_RAW_INITRD
#allows booting un-mkimage wrapped initrds
conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#Bootloader: u-boot settings
boot_script="uEnv.txt"
@ -24,13 +27,6 @@ boot_fstype="fat"
uboot_SCRIPT_ENTRY="uenvcmd"
uboot_CMD_LOAD="load"
#if: define CONFIG_SUPPORT_RAW_INITRD
conf_normal_initrd_file=initrd.img
conf_net_initrd_file=initrd.net
##otherwise:
#conf_normal_initrd_file=uInitrd
#conf_net_initrd_file=uInitrd.net
#Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap
kernel_subarch="omap"

@ -17,6 +17,9 @@ boot_name="u-boot.img"
#CONFIG_CMD_BOOTZ
#bootz & zImage
conf_uboot_CONFIG_CMD_BOOTZ=1
#CONFIG_SUPPORT_RAW_INITRD
#allows booting un-mkimage wrapped initrds
conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#Bootloader: u-boot settings
boot_script="uEnv.txt"
@ -24,13 +27,6 @@ boot_fstype="fat"
uboot_SCRIPT_ENTRY="uenvcmd"
uboot_CMD_LOAD="load"
#if: define CONFIG_SUPPORT_RAW_INITRD
conf_normal_initrd_file=initrd.img
conf_net_initrd_file=initrd.net
##otherwise:
#conf_normal_initrd_file=uInitrd
#conf_net_initrd_file=uInitrd.net
#Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap
kernel_subarch="omap"

@ -17,6 +17,9 @@ boot_name="u-boot.img"
#CONFIG_CMD_BOOTZ
#bootz & zImage
conf_uboot_CONFIG_CMD_BOOTZ=1
#CONFIG_SUPPORT_RAW_INITRD
#allows booting un-mkimage wrapped initrds
conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#Bootloader: u-boot settings
boot_script="uEnv.txt"
@ -24,13 +27,6 @@ boot_fstype="fat"
uboot_SCRIPT_ENTRY="uenvcmd"
uboot_CMD_LOAD="load"
#if: define CONFIG_SUPPORT_RAW_INITRD
conf_normal_initrd_file=initrd.img
conf_net_initrd_file=initrd.net
##otherwise:
#conf_normal_initrd_file=uInitrd
#conf_net_initrd_file=uInitrd.net
#Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap
kernel_subarch="omap"

@ -17,6 +17,9 @@ boot_name="u-boot.img"
#CONFIG_CMD_BOOTZ
#bootz & zImage
conf_uboot_CONFIG_CMD_BOOTZ=1
#CONFIG_SUPPORT_RAW_INITRD
#allows booting un-mkimage wrapped initrds
conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#Bootloader: u-boot settings
boot_script="uEnv.txt"
@ -24,13 +27,6 @@ boot_fstype="fat"
uboot_SCRIPT_ENTRY="uenvcmd"
uboot_CMD_LOAD="load"
#if: define CONFIG_SUPPORT_RAW_INITRD
conf_normal_initrd_file=initrd.img
conf_net_initrd_file=initrd.net
##otherwise:
#conf_normal_initrd_file=uInitrd
#conf_net_initrd_file=uInitrd.net
#Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap
kernel_subarch="omap"

@ -22,6 +22,9 @@ boot_name="u-boot.imx"
#CONFIG_CMD_BOOTZ
#bootz & zImage
conf_uboot_CONFIG_CMD_BOOTZ=1
#CONFIG_SUPPORT_RAW_INITRD
#allows booting un-mkimage wrapped initrds
conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#Bootloader: u-boot settings
boot_script="uEnv.txt"
@ -30,13 +33,6 @@ uboot_USE_MMC_DEFINES=1
uboot_SCRIPT_ENTRY="uenvcmd"
uboot_CMD_LOAD="load"
#if: define CONFIG_SUPPORT_RAW_INITRD
conf_normal_initrd_file=initrd.img
conf_net_initrd_file=initrd.net
##otherwise:
#conf_normal_initrd_file=uInitrd
#conf_net_initrd_file=uInitrd.net
#Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx
kernel_subarch="wand"

@ -22,6 +22,9 @@ boot_name="u-boot.imx"
#CONFIG_CMD_BOOTZ
#bootz & zImage
conf_uboot_CONFIG_CMD_BOOTZ=1
#CONFIG_SUPPORT_RAW_INITRD
#allows booting un-mkimage wrapped initrds
conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
#Bootloader: u-boot settings
boot_script="uEnv.txt"
@ -30,13 +33,6 @@ uboot_USE_MMC_DEFINES=1
uboot_SCRIPT_ENTRY="uenvcmd"
uboot_CMD_LOAD="load"
#if: define CONFIG_SUPPORT_RAW_INITRD
conf_normal_initrd_file=initrd.img
conf_net_initrd_file=initrd.net
##otherwise:
#conf_normal_initrd_file=uInitrd
#conf_net_initrd_file=uInitrd.net
#Kernel:
#http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx
kernel_subarch="wand"

@ -1467,6 +1467,14 @@ process_dtb_conf () {
conf_normal_kernel_file=uImage
conf_net_kernel_file=uImage.net
fi
if [ "${conf_uboot_CONFIG_SUPPORT_RAW_INITRD}" ] ; then
conf_normal_initrd_file=initrd.img
conf_net_initrd_file=initrd.net
else
conf_normal_initrd_file=uInitrd
conf_net_initrd_file=uInitrd.net
fi
}
check_dtb_board () {
@ -1558,14 +1566,6 @@ check_uboot_type () {
unset usbnet_mem
boot_partition_size="100"
#if: define CONFIG_CMD_BOOTZ
conf_normal_kernel_file=zImage
conf_net_kernel_file=zImage.net
#if: define CONFIG_SUPPORT_RAW_INITRD
conf_normal_initrd_file=initrd.img
conf_net_initrd_file=initrd.net
case "${UBOOT_TYPE}" in
beagle_bx)
. "${DIR}"/hwpack/omap3-beagle-xm.conf
@ -1604,8 +1604,6 @@ check_uboot_type () {
#just to disable the omapfb stuff..
USE_KMS=1
conf_note="Note: During the install use a 5Volt DC power supply as USB does not always provide enough power. If board locks up on boot run [sudo ifconfig usb0 up] on host."
conf_normal_initrd_file=uInitrd
conf_net_initrd_file=uInitrd.net
conf_uboot_CONFIG_CMD_BOOTZ=1
convert_uboot_to_dtb_board
;;
@ -1627,8 +1625,6 @@ check_uboot_type () {
#just to disable the omapfb stuff..
USE_KMS=1
conf_note="Note: During the install use a 5Volt DC power supply as USB does not always provide enough power. If board locks up on boot run [sudo ifconfig usb0 up] on host."
conf_normal_initrd_file=uInitrd
conf_net_initrd_file=uInitrd.net
conf_uboot_CONFIG_CMD_BOOTZ=1
convert_uboot_to_dtb_board
;;

Loading…
Cancel
Save