uboot-grub: add unstable config

2 files changed, 151 insertions, 70 deletions

diff --git a/libre/uboot-grub/PKGBUILD b/libre/uboot-grub/PKGBUILD
index 6dcfc3364..8c21d6548 100644
--- a/libre/uboot-grub/PKGBUILD
+++ b/libre/uboot-grub/PKGBUILD
@@ -26,9 +26,6 @@ _prepare_uboot-grub-am335x_evm() {
 	cp -r "${srcdir}/${_pkgbase}-${pkgver}/" "${srcdir}/${pkgbase}-am335x_evm-${pkgver}/"
 	cd "${srcdir}/${pkgbase}-am335x_evm-${pkgver}/"
 
-	msg 'Patch to boot on GRUB'
-	patch -p1 -i "${srcdir}/uboot-am335x_evm_boot-on-grub.patch"
-
 	msg 'Add am335x_evm configuration'
 	cat "${srcdir}/config.am335x_evm" > '.config'
 
@@ -47,6 +44,9 @@ prepare() {
 	msg '[Das U-Boot ver.2015.07]: Fix removing board selection choices optional'
 	patch -p1 -i "${srcdir}/0001-Revert-arch-Make-board-selection-choices-optional.patch
 
+	msg 'Patch to boot on GRUB'
+	patch -p1 -i "${srcdir}/uboot-am335x_evm_boot-on-grub.patch"
+
 	if [[ "${CARCH}" == "armv7h" ]]; then
 		msg "Prepare U-Boot for am335x_evm to run GRUB"
 		_prepare_uboot-grub-am335x_evm
diff --git a/libre/uboot-grub/config.am335x_evm b/libre/uboot-grub/config.am335x_evm
index 64598a39f..0baf1cd05 100644
--- a/libre/uboot-grub/config.am335x_evm
+++ b/libre/uboot-grub/config.am335x_evm
@@ -30,7 +30,7 @@ CONFIG_SYS_CONFIG_NAME="am335x_evm"
 #
 CONFIG_HAS_VBAR=y
 CONFIG_CPU_V7=y
-# CONFIG_SEMIHOSTING is not set
+CONFIG_SEMIHOSTING=y
 # CONFIG_ARCH_AT91 is not set
 # CONFIG_TARGET_EDB93XX is not set
 # CONFIG_TARGET_SCB9328 is not set
@@ -181,7 +181,8 @@ CONFIG_TARGET_AM335X_EVM=y
 # CONFIG_TARGET_STM32F429_DISCOVERY is not set
 CONFIG_SYS_MALLOC_F_LEN=0x400
 CONFIG_CONS_INDEX=1
-# CONFIG_NOR is not set
+CONFIG_NOR=y
+CONFIG_NOR_BOOT=y
 
 #
 # ARM debug
@@ -193,7 +194,7 @@ CONFIG_DEFAULT_DEVICE_TREE=""
 # General setup
 #
 CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYS_MALLOC_F=y
 CONFIG_EXPERT=y
@@ -206,19 +207,25 @@ CONFIG_SUPPORT_SPL=y
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
-# CONFIG_FIT is not set
-CONFIG_SYS_EXTRA_OPTIONS="NAND"
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+# CONFIG_FIT_SIGNATURE is not set
+CONFIG_SYS_EXTRA_OPTIONS=""
 
 #
 # Command line interface
 #
-CONFIG_HUSH_PARSER=y
-CONFIG_SYS_HUSH_PARSER=y
+# CONFIG_HUSH_PARSER is not set
 
 #
 # Autoboot options
 #
-# CONFIG_AUTOBOOT_KEYED is not set
+CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_PROMPT="Autoboot in %d seconds\n"
+# CONFIG_AUTOBOOT_ENCRYPTION is not set
+CONFIG_AUTOBOOT_DELAY_STR=""
+CONFIG_AUTOBOOT_STOP_STR=""
+CONFIG_AUTOBOOT_KEYED_CTRLC=y
 
 #
 # Commands
@@ -257,24 +264,24 @@ CONFIG_CMD_ENV_EXISTS=y
 #
 CONFIG_CMD_MEMORY=y
 CONFIG_CMD_CRC32=y
-# CONFIG_LOOPW is not set
+CONFIG_LOOPW=y
 CONFIG_CMD_MEMTEST=y
-# CONFIG_CMD_MX_CYCLIC is not set
+CONFIG_CMD_MX_CYCLIC=y
 CONFIG_CMD_MEMINFO=y
 
 #
 # Device access commands
 #
 CONFIG_CMD_DM=y
-# CONFIG_CMD_DEMO is not set
+CONFIG_CMD_DEMO=y
 CONFIG_CMD_LOADB=y
 CONFIG_CMD_LOADS=y
 CONFIG_CMD_FLASH=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_SF=y
-CONFIG_CMD_SPI=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_USB=y
+# CONFIG_CMD_SF is not set
+# CONFIG_CMD_SPI is not set
+# CONFIG_CMD_I2C is not set
+# CONFIG_CMD_USB is not set
 CONFIG_CMD_FPGA=y
 
 #
@@ -289,13 +296,13 @@ CONFIG_CMD_SETEXPR=y
 # Network commands
 #
 CONFIG_CMD_NET=y
-# CONFIG_CMD_TFTPPUT is not set
-# CONFIG_CMD_TFTPSRV is not set
-# CONFIG_CMD_RARP is not set
-CONFIG_CMD_DHCP=y
+CONFIG_CMD_TFTPPUT=y
+CONFIG_CMD_TFTPSRV=y
+CONFIG_CMD_RARP=y
+# CONFIG_CMD_DHCP is not set
 CONFIG_CMD_NFS=y
-CONFIG_CMD_PING=y
-# CONFIG_CMD_CDP is not set
+# CONFIG_CMD_PING is not set
+CONFIG_CMD_CDP=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_DNS=y
 CONFIG_CMD_LINK_LOCAL=y
@@ -306,18 +313,21 @@ CONFIG_CMD_LINK_LOCAL=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_MISC=y
 CONFIG_CMD_TIMER=y
+CONFIG_CMD_SOUND=y
 
 #
 # Boot timing
 #
 # CONFIG_BOOTSTAGE is not set
-CONFIG_BOOTSTAGE_USER_COUNT=20
-CONFIG_BOOTSTAGE_STASH_ADDR=0
-CONFIG_BOOTSTAGE_STASH_SIZE=4096
+CONFIG_BOOTSTAGE_USER_COUNT=0x20
+CONFIG_BOOTSTAGE_STASH_ADDR=0x0
+CONFIG_BOOTSTAGE_STASH_SIZE=0x4096
 
 #
 # Power commands
 #
+CONFIG_CMD_PMIC=y
+CONFIG_CMD_REGULATOR=y
 CONFIG_SUPPORT_OF_CONTROL=y
 
 #
@@ -325,97 +335,165 @@ CONFIG_SUPPORT_OF_CONTROL=y
 #
 # CONFIG_OF_CONTROL is not set
 CONFIG_NET=y
-# CONFIG_NET_RANDOM_ETHADDR is not set
+CONFIG_NET_RANDOM_ETHADDR=y
 
 #
 # Device Drivers
 #
 CONFIG_DM=y
-# CONFIG_SPL_DM is not set
+CONFIG_SPL_DM=y
 CONFIG_DM_WARN=y
 CONFIG_DM_DEVICE_REMOVE=y
 CONFIG_DM_STDIO=y
 CONFIG_DM_SEQ_ALIAS=y
-# CONFIG_CPU is not set
-# CONFIG_DM_DEMO is not set
+CONFIG_CPU=y
+CONFIG_DM_DEMO=y
+CONFIG_DM_DEMO_SIMPLE=y
+CONFIG_DM_DEMO_SHAPE=y
 
 #
 # PCI
 #
-# CONFIG_DM_PCI is not set
+CONFIG_DM_PCI=y
 
 #
 # NAND Device Support
 #
-# CONFIG_NAND_DENALI is not set
-# CONFIG_NAND_VF610_NFC is not set
-# CONFIG_SYS_NAND_VF610_NFC_45_ECC_BYTES is not set
+CONFIG_SYS_NAND_SELF_INIT=y
+CONFIG_NAND_DENALI=y
+# CONFIG_SYS_NAND_DENALI_64BIT is not set
+CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=32
+CONFIG_NAND_VF610_NFC=y
+CONFIG_SYS_NAND_VF610_NFC_45_ECC_BYTES=y
 # CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES is not set
 
 #
 # Generic NAND options
 #
-# CONFIG_SPL_NAND_DENALI is not set
+# CONFIG_SYS_NAND_BUSWIDTH_16BIT is not set
+CONFIG_SPL_NAND_DENALI=y
 
 #
 # SPI Flash Support
 #
+# CONFIG_DM_SPI_FLASH is not set
 CONFIG_SPI_FLASH=y
-# CONFIG_SPI_FLASH_BAR is not set
-# CONFIG_SPI_FLASH_MTD is not set
-# CONFIG_CROS_EC is not set
-# CONFIG_CONFIG_FSL_SEC_MON is not set
-# CONFIG_PCA9551_LED is not set
-# CONFIG_DM_ETH is not set
+CONFIG_SPI_FLASH_BAR=y
+CONFIG_SPI_FLASH_MTD=y
+CONFIG_CMD_CROS_EC=y
+CONFIG_CROS_EC=y
+CONFIG_CROS_EC_I2C=y
+CONFIG_CROS_EC_LPC=y
+CONFIG_CROS_EC_SPI=y
+CONFIG_CONFIG_FSL_SEC_MON=y
+CONFIG_PCA9551_LED=y
+CONFIG_PCA9551_I2C_ADDR=0x60
+CONFIG_DM_ETH=y
 CONFIG_NETDEVICES=y
-# CONFIG_ETH_DESIGNWARE is not set
-# CONFIG_CROS_EC_KEYB is not set
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_CROS_EC_KEYB=y
 CONFIG_DM_SERIAL=y
 # CONFIG_DEBUG_UART is not set
-# CONFIG_TPM_TIS_SANDBOX is not set
+CONFIG_TPM_TIS_SANDBOX=y
 # CONFIG_DM_I2C is not set
-# CONFIG_DM_I2C_COMPAT is not set
+CONFIG_DM_I2C_COMPAT=y
 
 #
 # SPI Support
 #
-# CONFIG_DM_SPI is not set
-# CONFIG_FSL_ESPI is not set
-# CONFIG_TI_QSPI is not set
+CONFIG_DM_SPI=y
+CONFIG_CADENCE_QSPI=y
+CONFIG_DESIGNWARE_SPI=y
+CONFIG_EXYNOS_SPI=y
+CONFIG_FSL_DSPI=y
+CONFIG_FSL_QSPI=y
+CONFIG_ICH_SPI=y
+CONFIG_TEGRA114_SPI=y
+CONFIG_TEGRA20_SFLASH=y
+CONFIG_TEGRA20_SLINK=y
+CONFIG_XILINX_SPI=y
+CONFIG_FSL_ESPI=y
+CONFIG_TI_QSPI=y
 CONFIG_DM_GPIO=y
-# CONFIG_LPC32XX_GPIO is not set
-# CONFIG_VYBRID_GPIO is not set
+CONFIG_LPC32XX_GPIO=y
+CONFIG_VYBRID_GPIO=y
 
 #
 # Power
 #
-# CONFIG_DM_PMIC is not set
-# CONFIG_DM_REGULATOR is not set
-# CONFIG_VIDEO_VESA is not set
-# CONFIG_VIDEO_LCD_SSD2828 is not set
-# CONFIG_DISPLAY_PORT is not set
-# CONFIG_VIDEO_TEGRA124 is not set
-# CONFIG_SOUND is not set
+CONFIG_DM_PMIC=y
+CONFIG_DM_PMIC_MAX77686=y
+CONFIG_DM_PMIC_SANDBOX=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_MAX77686=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_SANDBOX=y
+CONFIG_VIDEO_VESA=y
+CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
+# CONFIG_FRAMEBUFFER_VESA_MODE_100 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_101 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_102 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_103 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_104 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_105 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_106 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_107 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_108 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_109 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_10A is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_10B is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_10C is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_10D is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_10E is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_10F is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_110 is not set
+CONFIG_FRAMEBUFFER_VESA_MODE_111=y
+# CONFIG_FRAMEBUFFER_VESA_MODE_112 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_113 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_114 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_115 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_116 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_117 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_118 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_119 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_11A is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_11B is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_USER is not set
+CONFIG_FRAMEBUFFER_VESA_MODE=0x111
+CONFIG_VIDEO_LCD_SSD2828=y
+CONFIG_VIDEO_LCD_SSD2828_TX_CLK=0
+CONFIG_VIDEO_LCD_SSD2828_RESET=""
+CONFIG_VIDEO_LCD_SPI_CS=""
+CONFIG_VIDEO_LCD_SPI_SCLK=""
+CONFIG_VIDEO_LCD_SPI_MOSI=""
+CONFIG_VIDEO_LCD_SPI_MISO=""
+CONFIG_DISPLAY_PORT=y
+CONFIG_VIDEO_TEGRA124=y
+CONFIG_SOUND=y
+CONFIG_I2S=y
+CONFIG_I2S_SAMSUNG=y
+CONFIG_SOUND_MAX98095=y
+CONFIG_SOUND_WM8994=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
-# CONFIG_DM_USB is not set
+CONFIG_DM_USB=y
 
 #
 # USB Host Controller Drivers
 #
-# CONFIG_USB_XHCI_HCD is not set
-# CONFIG_USB_XHCI is not set
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI=y
-CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE is not set
 
 #
 # MMC Host controller Support
 #
-# CONFIG_DM_RTC is not set
-# CONFIG_FSL_CAAM is not set
-# CONFIG_DM_THERMAL is not set
-# CONFIG_PHYS_TO_BUS is not set
+CONFIG_DM_RTC=y
+CONFIG_FSL_CAAM=y
+CONFIG_DM_THERMAL=y
+CONFIG_PHYS_TO_BUS=y
 
 #
 # File systems
@@ -428,7 +506,7 @@ CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_HAVE_PRIVATE_LIBGCC=y
 # CONFIG_USE_PRIVATE_LIBGCC is not set
 CONFIG_SYS_HZ=1000
-# CONFIG_SYS_VSNPRINTF is not set
+CONFIG_SYS_VSNPRINTF=y
 CONFIG_REGEX=y
 CONFIG_LIB_RAND=y
 # CONFIG_RSA is not set
@@ -438,6 +516,9 @@ CONFIG_LIB_RAND=y
 #
 # CONFIG_SHA1 is not set
 # CONFIG_SHA256 is not set
-# CONFIG_SHA_HW_ACCEL is not set
-# CONFIG_ERRNO_STR is not set
-# CONFIG_UNIT_TEST is not set
+CONFIG_SHA_HW_ACCEL=y
+CONFIG_SHA_PROG_HW_ACCEL=y
+CONFIG_ERRNO_STR=y
+CONFIG_UNIT_TEST=y
+CONFIG_UT_TIME=y
+CONFIG_UT_ENV=y