uboot-grub: add generic board config and header

3 files changed, 475 insertions, 2 deletions

diff --git a/libre/uboot-grub/PKGBUILD b/libre/uboot-grub/PKGBUILD
index e676577d0..6bb28d994 100644
--- a/libre/uboot-grub/PKGBUILD
+++ b/libre/uboot-grub/PKGBUILD
@@ -10,12 +10,16 @@ license=('GPL2')
 makedepends=('bc')
 source=("ftp://ftp.denx.de/pub/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2"
         '0001-Revert-arch-Make-board-selection-choices-optional.patch'
+	'config.generic'
+	'generic.h'
         'uboot-am335x_evm_boot-on-grub.patch'
         'config.am335x_evm'
         'uEnv-am335x_evm.txt'
         "${pkgbase}-install-am335x_evm.sh")
 sha512sums=('40878f28c19f077bc83b82687c9f656c64ef2bdbbc3b4caf3f7ec657a7200ce212713cd5adbc0cb23379950fe804767d1efb9108cc8c33b66faa7c7d3a831ffe'
             '8da39a3c8aa05a1897c4b0b2279c6e819523a46f6bce4b4a9027e58cc9d5c6ccf7787dfcf03453ece6f114e5638d06dcad055d276d4dfbcca3d65366afe46fe7'
+            '91cffc9bd2da1146aa9a86d7ef7236df0a0100eb5800fc4a6696ecdc91f68a4ec85865257b6232701ea15b6ef940a0b62de95072a4019cb21ec86863b74513cf'
+            '8520f5416b975409db69ac8093c56495d2037a106ee76925e9dd869cdc853b81390ba895704801b3a893992919ec3e95aee31504eb1d68b065da83a09a2c74dd'
             'c292fa1c90c33d4291e5d24d3ff4834949fc14f9835fe71b6a3de29005438910b3ed6ade081e8c78617302b3912edcaf9b7806596506fa1fdc3154d929d9a055'
             'ade631646eb5de3a7f0cbd4577cfbf50979d242bce6f1a00e31ab49c15fd44295c61bd4f12a66e521a0c04b394e7a9172a70241281f119cfd3d56394d514e531'
             'd8287e898bdcb1a542693c2bf94eead62a640d845145527005ce37e1bbba1e73552ef2728271b7486c7fb059239de7f18fe254af30b03b4293a5993ce1e8b351'
@@ -29,6 +33,7 @@ _prepare_uboot-grub-am335x_evm() {
 	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'
 
 	unset CFLAGS CXXFLAGS LDFLAGS
@@ -43,8 +48,14 @@ _prepare_uboot-grub-am335x_evm() {
 prepare() {
 	cd "${srcdir}/${_pkgbase}-${pkgver}/"
 
-	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 'Add generic configuration'
+	cat "${srcdir}/config.generic" > '.config'
+
+	msg '[Das U-Boot ver.2015.07]: Fix add "include/configs/.h" file for generic board'
+	cat "${srcdir}/generic.h" > 'include/configs/.h'
+
+	# 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
 
 	if [[ "${CARCH}" == "armv7h" ]]; then
 		msg "Prepare U-Boot for am335x_evm to run GRUB"
diff --git a/libre/uboot-grub/config.generic b/libre/uboot-grub/config.generic
new file mode 100644
index 000000000..44c753ce7
--- /dev/null
+++ b/libre/uboot-grub/config.generic
@@ -0,0 +1,362 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# U-Boot 2015.07 Configuration
+#
+CONFIG_HAVE_GENERIC_BOARD=y
+# CONFIG_ARC is not set
+CONFIG_ARM=y
+# CONFIG_AVR32 is not set
+# CONFIG_BLACKFIN is not set
+# CONFIG_M68K is not set
+# CONFIG_MICROBLAZE is not set
+# CONFIG_MIPS is not set
+# CONFIG_NDS32 is not set
+# CONFIG_NIOS2 is not set
+# CONFIG_OPENRISC is not set
+# CONFIG_PPC is not set
+# CONFIG_SANDBOX is not set
+# CONFIG_SH is not set
+# CONFIG_SPARC is not set
+# CONFIG_X86 is not set
+CONFIG_SYS_ARCH="arm"
+
+#
+# ARM architecture
+#
+CONFIG_SEMIHOSTING=y
+CONFIG_SYS_MALLOC_F_LEN=0x400
+
+#
+# ARM debug
+#
+# CONFIG_DEBUG_LL is not set
+CONFIG_DEFAULT_DEVICE_TREE=""
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYS_MALLOC_F=y
+CONFIG_EXPERT=y
+CONFIG_SYS_MALLOC_CLEAR_ON_INIT=y
+
+#
+# Boot images
+#
+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
+
+#
+# Autoboot options
+#
+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
+#
+
+#
+# Info commands
+#
+CONFIG_CMD_BDI=y
+CONFIG_CMD_CONSOLE=y
+CONFIG_CMD_CPU=y
+CONFIG_CMD_LICENSE=y
+
+#
+# Boot commands
+#
+CONFIG_CMD_BOOTD=y
+CONFIG_CMD_BOOTM=y
+CONFIG_CMD_GO=y
+CONFIG_CMD_RUN=y
+CONFIG_CMD_IMI=y
+CONFIG_CMD_IMLS=y
+CONFIG_CMD_XIMG=y
+
+#
+# Environment commands
+#
+CONFIG_CMD_EXPORTENV=y
+CONFIG_CMD_IMPORTENV=y
+CONFIG_CMD_EDITENV=y
+CONFIG_CMD_SAVEENV=y
+CONFIG_CMD_ENV_EXISTS=y
+
+#
+# Memory commands
+#
+CONFIG_CMD_MEMORY=y
+CONFIG_CMD_CRC32=y
+CONFIG_LOOPW=y
+CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_MX_CYCLIC=y
+CONFIG_CMD_MEMINFO=y
+
+#
+# Device access commands
+#
+CONFIG_CMD_DM=y
+# CONFIG_CMD_DEMO is not set
+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_FPGA=y
+
+#
+# Shell scripting commands
+#
+CONFIG_CMD_ECHO=y
+CONFIG_CMD_ITEST=y
+CONFIG_CMD_SOURCE=y
+CONFIG_CMD_SETEXPR=y
+
+#
+# Network commands
+#
+CONFIG_CMD_NET=y
+CONFIG_CMD_TFTPPUT=y
+CONFIG_CMD_TFTPSRV=y
+CONFIG_CMD_RARP=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_NFS=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_CDP=y
+CONFIG_CMD_SNTP=y
+CONFIG_CMD_DNS=y
+CONFIG_CMD_LINK_LOCAL=y
+
+#
+# Misc commands
+#
+CONFIG_CMD_TIME=y
+CONFIG_CMD_MISC=y
+CONFIG_CMD_TIMER=y
+# CONFIG_CMD_SOUND is not set
+
+#
+# Boot timing
+#
+# CONFIG_BOOTSTAGE is not set
+CONFIG_BOOTSTAGE_USER_COUNT=20
+CONFIG_BOOTSTAGE_STASH_ADDR=0
+CONFIG_BOOTSTAGE_STASH_SIZE=4096
+
+#
+# Power commands
+#
+# CONFIG_CMD_PMIC is not set
+# CONFIG_CMD_REGULATOR is not set
+CONFIG_SUPPORT_OF_CONTROL=y
+
+#
+# Device Tree Control
+#
+# CONFIG_OF_CONTROL is not set
+CONFIG_NET=y
+CONFIG_NET_RANDOM_ETHADDR=y
+
+#
+# Device Drivers
+#
+CONFIG_DM=y
+CONFIG_DM_WARN=y
+CONFIG_DM_DEVICE_REMOVE=y
+CONFIG_DM_STDIO=y
+CONFIG_DM_SEQ_ALIAS=y
+CONFIG_CPU=y
+CONFIG_DM_DEMO=y
+CONFIG_DM_DEMO_SIMPLE=y
+CONFIG_DM_DEMO_SHAPE=y
+
+#
+# PCI
+#
+CONFIG_DM_PCI=y
+
+#
+# NAND Device Support
+#
+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_SYS_NAND_BUSWIDTH_16BIT is not set
+
+#
+# SPI Flash Support
+#
+# CONFIG_DM_SPI_FLASH is not set
+CONFIG_SPI_FLASH=y
+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=y
+CONFIG_CROS_EC_KEYB=y
+CONFIG_DM_SERIAL=y
+# CONFIG_DEBUG_UART is not set
+CONFIG_TPM_TIS_SANDBOX=y
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_COMPAT=y
+CONFIG_DM_I2C_GPIO=y
+
+#
+# SPI Support
+#
+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=y
+CONFIG_VYBRID_GPIO=y
+
+#
+# Power
+#
+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=y
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI=y
+CONFIG_USB_STORAGE=y
+
+#
+# MMC Host controller Support
+#
+CONFIG_DM_RTC=y
+CONFIG_FSL_CAAM=y
+CONFIG_DM_THERMAL=y
+CONFIG_PHYS_TO_BUS=y
+
+#
+# File systems
+#
+
+#
+# Library routines
+#
+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=y
+CONFIG_REGEX=y
+CONFIG_LIB_RAND=y
+# CONFIG_RSA is not set
+
+#
+# Hashing Support
+#
+# CONFIG_SHA1 is not set
+# CONFIG_SHA256 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
diff --git a/libre/uboot-grub/generic.h b/libre/uboot-grub/generic.h
new file mode 100644
index 000000000..0c4410924
--- /dev/null
+++ b/libre/uboot-grub/generic.h
@@ -0,0 +1,100 @@
+#define CONFIG_API
+#define CONFIG_ATAPI
+#define CONFIG_BOARD_SPECIFIC_LED
+#define CONFIG_BZIP2
+#define CONFIG_CAN_DRIVER
+#define CONFIG_CMD_AES
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_BMP
+#define CONFIG_CMD_BSP
+#define CONFIG_CMD_BOOTMENU
+#define CONFIG_CMD_CACHE
+#define CONFIG_CMD_CBFS
+#define CONFIG_CMD_CLK
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_DFU
+#define CONFIG_CMD_DIAG
+#define CONFIG_CMD_EEPROM
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_ENV_CALLBACK
+#define CONFIG_CMD_ENV_FLAGS
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_EXT4
+#define CONFIG_CMD_EXT4_WRITE
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_FUSE
+#define CONFIG_CMD_FS_GENERIC
+#define CONFIG_CMD_FS_UUID
+#define CONFIG_CMD_FUSE
+#define CONFIG_CMD_GETTIME
+#define CONFIG_CMD_GREPENV
+#define CONFIG_CMD_HASH
+#define CONFIG_CMD_HWFLOW
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_IMLS_NAND
+#define CONFIG_CMD_IMMAP
+#define CONFIG_CMD_INI
+#define CONFIG_CMD_IRQ
+#define CONFIG_CMD_JFFS2
+#define CONFIG_CMD_MD5SUM
+#define CONFIG_CMD_MMC
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_MTDPARTS
+#define CONFIG_CMD_PCI
+#define CONFIG_CMD_PORTIO
+#define CONFIG_CMD_READ
+#define CONFIG_CMD_REGINFO
+#define CONFIG_CMD_SAVES
+#define CONFIG_CMD_SDRAM
+#define CONFIG_CMD_SHA1SUM
+#define CONFIG_CMD_UBI
+#define CONFIG_CMD_UBIFS
+#define CONFIG_CMD_UUID
+#define CONFIG_DFU_FUNCTION
+#define CONFIG_DFU_MMC
+#define CONFIG_DFU_NAND
+#define CONFIG_DFU_RAM
+#define CONFIG_DOS_PARTITION
+#define CONFIG_ENV_SIZE 2048
+#define CONFIG_EXT4_WRITE
+#define CONFIG_FAT_WRITE
+#define CONFIG_FS_EXT4
+#define CONFIG_FS_FAT
+#define CONFIG_GENERIC_MMC
+#define CONFIG_GPIO_LED
+#define CONFIG_HAS_DATAFLASH
+#define CONFIG_ISA_KEYBOARD
+#define CONFIG_ISO_PARTITION
+#define CONFIG_KEYBOARD
+#define CONFIG_LBA48
+#define CONFIG_LCD
+#define CONFIG_LZMA
+#define CONFIG_LZO
+#define CONFIG_MAC_PARTITION
+#define CONFIG_MENU
+#define CONFIG_MENU_SHOW
+#define CONFIG_MTD_PARTITIONS
+#define CONFIG_NR_DRAM_BANKS 1
+#define CONFIG_NR_DRAM_BANKS_MAX 8
+/* #define CONFIG_SHA1 */
+/* #define CONFIG_SHA256 */
+#define CONFIG_SHOW_BOOT_PROGRESS
+#define CONFIG_SOFT_SPI
+#define CONFIG_SPI
+#define CONFIG_SPLASH_SCREEN
+#define CONFIG_STATUS_LED
+#define CONFIG_SUPPORT_EMMC_BOOT
+#define CONFIG_SUPPORT_EMMC_RPMB
+#define CONFIG_SYS_64BIT_LBA
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV
+/* #define CONFIG_SYS_I2C */
+#define CONFIG_SYS_MAX_FLASH_SECT 512
+#define CONFIG_TPL
+#define CONFIG_USB_DEVICE
+#define CONFIG_USB_KEYBOARD
+#define CONFIG_USB_TTY
+#define CONFIG_USB_UHCI
+#define CONFIG_USBD_HS
+#define CONFIG_VIDEO
+#define CONFIG_WATCHDOG
+#define CONFIG_HW_WATCHDOG