Merge Official Source

2019-11-20 22:14:31 +08:00 · 2019-11-20 22:14:31 +08:00 · 6417bf7e6e
commit 6417bf7e6e
parent 52e1011a94 3cee6f3f24
20 changed files with 828 additions and 3791 deletions
--- a/package/boot/uboot-omap/Makefile
+++ b/package/boot/uboot-omap/Makefile
@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

-PKG_VERSION:=2017.01
-PKG_RELEASE:=4
+PKG_VERSION:=2019.10
+PKG_RELEASE:=1

-PKG_HASH:=6c425175f93a4bcf2ec9faf5658ef279633dbd7856a293d95bd1ff516528ecf2
+PKG_HASH:=8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014

 include $(INCLUDE_DIR)/u-boot.mk
 include $(INCLUDE_DIR)/package.mk
@ -19,7 +19,6 @@ include $(INCLUDE_DIR)/package.mk
 define U-Boot/Default
  BUILD_TARGET:=omap
  UBOOT_IMAGE:=u-boot.img MLO
-  UENV:=default
 endef

 define U-Boot/omap4_panda
@ -27,14 +26,9 @@ define U-Boot/omap4_panda
  BUILD_DEVICES:=ti_omap4-panda
 endef

-define U-Boot/am335x_boneblack
-  NAME:=TI AM335x BeagleBone Black
-  BUILD_DEVICES:=ti_am335x-bone-black
-endef
-
 define U-Boot/am335x_evm
  NAME:=AM335x EVM
-  BUILD_DEVICES:=ti_am335x-evm
+  BUILD_DEVICES:=ti_am335x-evm ti_am335x-bone-black
 endef

 define U-Boot/omap3_overo
@ -46,12 +40,19 @@ define U-Boot/omap3_beagle
  BUILD_DEVICES:=ti_omap3-beagle
 endef

-UBOOT_TARGETS:=omap4_panda am335x_evm omap3_overo omap3_beagle am335x_boneblack
+UBOOT_TARGETS:=omap4_panda am335x_evm omap3_overo omap3_beagle

 define Build/InstallDev
-	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)/$(BUILD_DEVICES)
-	$(CP) $(patsubst %,$(PKG_BUILD_DIR)/%,$(UBOOT_IMAGE)) $(STAGING_DIR_IMAGE)/$(BUILD_DEVICES)/
-	$(CP) ./files/uEnv-$(UENV).txt $(STAGING_DIR_IMAGE)/$(BUILD_DEVICES)/uEnv.txt
+	$(foreach device,$(BUILD_DEVICES), \
+		$(INSTALL_DIR) $(STAGING_DIR_IMAGE)/$(device)
+	)
+	$(foreach device,$(BUILD_DEVICES), \
+		$(CP) $(patsubst %,$(PKG_BUILD_DIR)/%,$(UBOOT_IMAGE)) $(STAGING_DIR_IMAGE)/$(device)/
+	)
+	$(foreach device,$(BUILD_DEVICES), \
+		mkimage -C none -A arm -T script -d ./files/boot.scr.txt \
+			$(STAGING_DIR_IMAGE)/$(device)/boot.scr
+	)
 endef

 $(eval $(call BuildPackage/U-Boot))
--- a/package/boot/uboot-omap/files/boot.scr.txt
+++ b/package/boot/uboot-omap/files/boot.scr.txt
@ -0,0 +1,9 @@
+if test -z "${devnum}"; then
+	setenv devnum 0
+fi
+
+setenv bootargs console=${console} root=/dev/mmcblk${devnum}p2 rootwait
+
+load mmc ${devnum}:1 ${loadaddr} /zImage \
+&& load mmc ${devnum}:1 ${fdtaddr} /dtbs/${fdtfile} \
+&& bootz ${loadaddr} - ${fdtaddr}
--- a/package/boot/uboot-omap/files/uEnv-default.txt
+++ b/package/boot/uboot-omap/files/uEnv-default.txt
@ -1,8 +0,0 @@
-bootpart=0:1
-bootdir=/
-bootfile=zImage
-fdtdir=/dtbs
-uenvcmd=run loadfdt; run loadimage; run uenvbootargs ; bootz ${loadaddr} - ${fdtaddr}
-loadfdt=load mmc ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}
-devtype=mmc
-uenvbootargs=setenv bootargs console=${console} root=/dev/mmcblk0p2 rootwait
--- a/package/boot/uboot-omap/patches/101-disable-thumb-omap3.patch
+++ b/package/boot/uboot-omap/patches/101-disable-thumb-omap3.patch
@ -1,14 +0,0 @@
-Index: u-boot-2017.01/include/configs/ti_omap3_common.h
-===================================================================
--- u-boot-2017.01.orig/include/configs/ti_omap3_common.h
-+++ u-boot-2017.01/include/configs/ti_omap3_common.h
-@@ -80,4 +80,9 @@
- /* Now bring in the rest of the common code. */
- #include <configs/ti_armv7_omap.h>
- 
-+/* beagleboard doesnt boot with thumb */
-+#ifdef CONFIG_SYS_THUMB_BUILD
-+#undef CONFIG_SYS_THUMB_BUILD
-+#endif
-+
- #endif	/* __CONFIG_TI_OMAP3_COMMON_H__ */
--- a/package/boot/uboot-omap/patches/102-minify-spl.patch
+++ b/package/boot/uboot-omap/patches/102-minify-spl.patch
@ -1,44 +0,0 @@
-Index: u-boot-2017.01/configs/omap3_beagle_defconfig
-===================================================================
--- u-boot-2017.01.orig/configs/omap3_beagle_defconfig
-+++ u-boot-2017.01/configs/omap3_beagle_defconfig
-@@ -7,7 +7,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
- CONFIG_VERSION_VARIABLE=y
- CONFIG_SPL=y
- CONFIG_SPL_MTD_SUPPORT=y
-CONFIG_SPL_OS_BOOT=y
-+# CONFIG_SPL_EXT_SUPPORT is not set
- # CONFIG_CMD_IMLS is not set
- CONFIG_CMD_ASKENV=y
- # CONFIG_CMD_FLASH is not set
-Index: u-boot-2017.01/common/Makefile
-===================================================================
--- u-boot-2017.01.orig/common/Makefile
-+++ u-boot-2017.01/common/Makefile
-@@ -174,8 +174,11 @@ obj-$(CONFIG_CMDLINE) += cli_simple.o
- obj-y += cli.o
- obj-$(CONFIG_CMDLINE) += cli_readline.o
- obj-$(CONFIG_CMD_DFU) += dfu.o
-+
-+ifndef CONFIG_SPL_BUILD
- obj-y += command.o
- obj-y += s_record.o
- obj-y += xyzModem.o
-+endif
- 
- CFLAGS_env_embedded.o := -Wa,--no-warn -DENV_CRC=$(shell tools/envcrc 2>/dev/null)
-Index: u-boot-2017.01/cmd/Makefile
-===================================================================
--- u-boot-2017.01.orig/cmd/Makefile
-+++ u-boot-2017.01/cmd/Makefile
-@@ -161,7 +161,10 @@ endif # !CONFIG_SPL_BUILD
- 
- obj-$(CONFIG_CMD_BLOB) += blob.o
- 
-+
-+# ifndef CONFIG_SPL_BUILD
- # core command
- obj-y += nvedit.o
-+# endif # !CONFIG_SPL_BUILD
- 
- obj-$(CONFIG_ARCH_MVEBU) += mvebu/
--- a/package/boot/uboot-omap/patches/103-disable-fat-write-spl.patch
+++ b/package/boot/uboot-omap/patches/103-disable-fat-write-spl.patch
@ -1,27 +0,0 @@
-Index: u-boot-2017.01/fs/fat/Makefile
-===================================================================
--- u-boot-2017.01.orig/fs/fat/Makefile
-+++ u-boot-2017.01/fs/fat/Makefile
-@@ -4,8 +4,8 @@
- #
- 
- obj-$(CONFIG_FS_FAT)	:= fat.o
-obj-$(CONFIG_FAT_WRITE):= fat_write.o
- 
- ifndef CONFIG_SPL_BUILD
-+obj-$(CONFIG_FAT_WRITE):= fat_write.o
- obj-$(CONFIG_FS_FAT)	+= file.o
- endif
-Index: u-boot-2017.01/fs/fat/fat.c
-===================================================================
--- u-boot-2017.01.orig/fs/fat/fat.c
-+++ u-boot-2017.01/fs/fat/fat.c
-@@ -163,7 +163,7 @@ static void get_name(dir_entry *dirent,
- }
- 
- static int flush_dirty_fat_buffer(fsdata *mydata);
-#if !defined(CONFIG_FAT_WRITE)
-+#if !defined(CONFIG_FAT_WRITE) || defined(CONFIG_SPL_BUILD)
- /* Stub for read only operation */
- int flush_dirty_fat_buffer(fsdata *mydata)
- {
--- a/package/boot/uboot-omap/patches/104-omap3-overo-enable-thumb.patch
+++ b/package/boot/uboot-omap/patches/104-omap3-overo-enable-thumb.patch
@ -1,18 +0,0 @@
-Index: u-boot-2017.01/include/configs/omap3_overo.h
-===================================================================
--- u-boot-2017.01.orig/include/configs/omap3_overo.h
-+++ u-boot-2017.01/include/configs/omap3_overo.h
-@@ -11,6 +11,13 @@
- #define CONFIG_NAND
- 
- #include <configs/ti_omap3_common.h>
-+
-+/* try to enable thumb - unknown if it's working
-+ * but otherwise it's too big for spl */
-+#ifndef CONFIG_SYS_THUMB_BUILD
-+#define CONFIG_SYS_THUMB_BUILD
-+#endif
-+
- /*
-  * We are only ever GP parts and will utilize all of the "downloaded image"
-  * area in SRAM which starts at 0x40200000 and ends at 0x4020FFFF (64KB).
--- a/package/boot/uboot-omap/patches/105-serial-ns16550-bugfix-ns16550-fifo-not-enabled.patch
+++ b/package/boot/uboot-omap/patches/105-serial-ns16550-bugfix-ns16550-fifo-not-enabled.patch
@ -1,309 +0,0 @@
-From 17fa032671f7981628fe16b30399638842a4b1bb Mon Sep 17 00:00:00 2001
-From: Heiko Schocher <hs@denx.de>
-Date: Wed, 18 Jan 2017 08:05:49 +0100
-Subject: [PATCH] serial, ns16550: bugfix: ns16550 fifo not enabled
-
-commit: 65f83802b7a5b "serial: 16550: Add getfcr accessor"
-breaks u-boot commandline working with long commands
-sending to the board.
-
-Since the above patch, you have to setup the fcr register.
-
-For board/archs which enable OF_PLATDATA, the new field
-fcr in struct ns16550_platdata is not filled with a
-default value ...
-
-This leads in not setting up the uarts fifo, which ends
-in problems, when you send long commands to u-boots
-commandline.
-
-Detected this issue with automated tbot tests on am335x
-based shc board.
-
-The error does not popup, if you type commands. You need
-to copy&paste a long command to u-boots commandshell
-(or send a long command with tbot)
-
-Possible boards/plattforms with problems:
-./arch/arm/cpu/arm926ejs/lpc32xx/devices.c
-./arch/arm/mach-tegra/board.c
-./board/overo/overo.c
-./board/quipos/cairo/cairo.c
-./board/logicpd/omap3som/omap3logic.c
-./board/logicpd/zoom1/zoom1.c
-./board/timll/devkit8000/devkit8000.c
-./board/lg/sniper/sniper.c
-./board/ti/beagle/beagle.c
-./drivers/serial/serial_rockchip.c
-
-Signed-off-by: Heiko Schocher <hs@denx.de>
-Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
-Tested-by: Adam Ford <aford173@gmail.com>
-Reviewed-by: Tom Rini <trini@konsulko.com>
---
- arch/arm/cpu/arm926ejs/lpc32xx/devices.c | 12 ++++++++----
- arch/arm/mach-omap2/am33xx/board.c       | 18 ++++++++++++------
- arch/arm/mach-tegra/board.c              |  1 +
- board/isee/igep00x0/igep00x0.c           |  3 ++-
- board/lg/sniper/sniper.c                 |  3 ++-
- board/logicpd/omap3som/omap3logic.c      |  3 ++-
- board/logicpd/zoom1/zoom1.c              |  3 ++-
- board/overo/overo.c                      |  3 ++-
- board/quipos/cairo/cairo.c               |  3 ++-
- board/ti/beagle/beagle.c                 |  3 ++-
- board/timll/devkit8000/devkit8000.c      |  3 ++-
- drivers/serial/ns16550.c                 |  9 +++------
- drivers/serial/serial_rockchip.c         |  1 +
- include/ns16550.h                        |  5 +++++
- 14 files changed, 46 insertions(+), 24 deletions(-)
-
-diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/devices.c b/arch/arm/cpu/arm926ejs/lpc32xx/devices.c
-index 399b07c5420a..f744398ca7ad 100644
--- a/arch/arm/cpu/arm926ejs/lpc32xx/devices.c
-+++ b/arch/arm/cpu/arm926ejs/lpc32xx/devices.c
-@@ -45,10 +45,14 @@ void lpc32xx_uart_init(unsigned int uart_id)
- 
- #if !CONFIG_IS_ENABLED(OF_CONTROL)
- static const struct ns16550_platdata lpc32xx_uart[] = {
-	{ .base = UART3_BASE, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK },
-	{ .base = UART4_BASE, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK },
-	{ .base = UART5_BASE, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK },
-	{ .base = UART6_BASE, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK },
-+	{ .base = UART3_BASE, .reg_shift = 2,
-+	  .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
-+	{ .base = UART4_BASE, .reg_shift = 2,
-+	  .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
-+	{ .base = UART5_BASE, .reg_shift = 2,
-+	  .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
-+	{ .base = UART6_BASE, .reg_shift = 2,
-+	  .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
- };
- 
- #if defined(CONFIG_LPC32XX_HSUART)
-diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c
-index 73824df18fa7..190310fd0079 100644
--- a/arch/arm/mach-omap2/am33xx/board.c
-+++ b/arch/arm/mach-omap2/am33xx/board.c
-@@ -40,14 +40,20 @@ DECLARE_GLOBAL_DATA_PTR;
- 
- #if !CONFIG_IS_ENABLED(OF_CONTROL)
- static const struct ns16550_platdata am33xx_serial[] = {
-	{ .base = CONFIG_SYS_NS16550_COM1, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK },
-+	{ .base = CONFIG_SYS_NS16550_COM1, .reg_shift = 2,
-+	  .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
- # ifdef CONFIG_SYS_NS16550_COM2
-	{ .base = CONFIG_SYS_NS16550_COM2, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK },
-+	{ .base = CONFIG_SYS_NS16550_COM2, .reg_shift = 2,
-+	  .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
- #  ifdef CONFIG_SYS_NS16550_COM3
-	{ .base = CONFIG_SYS_NS16550_COM3, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK },
-	{ .base = CONFIG_SYS_NS16550_COM4, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK },
-	{ .base = CONFIG_SYS_NS16550_COM5, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK },
-	{ .base = CONFIG_SYS_NS16550_COM6, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK },
-+	{ .base = CONFIG_SYS_NS16550_COM3, .reg_shift = 2,
-+	  .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
-+	{ .base = CONFIG_SYS_NS16550_COM4, .reg_shift = 2,
-+	  .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
-+	{ .base = CONFIG_SYS_NS16550_COM5, .reg_shift = 2,
-+	  .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
-+	{ .base = CONFIG_SYS_NS16550_COM6, .reg_shift = 2,
-+	  .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
- #  endif
- # endif
- };
-diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
-index 3d1d26d13d13..b3a041b539af 100644
--- a/arch/arm/mach-tegra/board.c
-+++ b/arch/arm/mach-tegra/board.c
-@@ -219,6 +219,7 @@ static struct ns16550_platdata ns16550_com1_pdata = {
- 	.base = CONFIG_SYS_NS16550_COM1,
- 	.reg_shift = 2,
- 	.clock = CONFIG_SYS_NS16550_CLK,
-+	.fcr = UART_FCR_DEFVAL,
- };
- 
- U_BOOT_DEVICE(ns16550_com1) = {
-diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c
-index ae7959b1eb6e..5a3498f570a6 100644
--- a/board/isee/igep00x0/igep00x0.c
-+++ b/board/isee/igep00x0/igep00x0.c
-@@ -32,7 +32,8 @@ DECLARE_GLOBAL_DATA_PTR;
- static const struct ns16550_platdata igep_serial = {
- 	.base = OMAP34XX_UART3,
- 	.reg_shift = 2,
-	.clock = V_NS16550_CLK
-+	.clock = V_NS16550_CLK,
-+	.fcr = UART_FCR_DEFVAL,
- };
- 
- U_BOOT_DEVICE(igep_uart) = {
-diff --git a/board/lg/sniper/sniper.c b/board/lg/sniper/sniper.c
-index 0662449c3875..b2b8f8861f11 100644
--- a/board/lg/sniper/sniper.c
-+++ b/board/lg/sniper/sniper.c
-@@ -31,7 +31,8 @@ const omap3_sysinfo sysinfo = {
- static const struct ns16550_platdata serial_omap_platdata = {
- 	.base = OMAP34XX_UART3,
- 	.reg_shift = 2,
-	.clock = V_NS16550_CLK
-+	.clock = V_NS16550_CLK,
-+	.fcr = UART_FCR_DEFVAL,
- };
- 
- U_BOOT_DEVICE(sniper_serial) = {
-diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c
-index 21b3fdcf49cf..b2fcc28f8b4b 100644
--- a/board/logicpd/omap3som/omap3logic.c
-+++ b/board/logicpd/omap3som/omap3logic.c
-@@ -49,7 +49,8 @@ DECLARE_GLOBAL_DATA_PTR;
- static const struct ns16550_platdata omap3logic_serial = {
- 	.base = OMAP34XX_UART1,
- 	.reg_shift = 2,
-	.clock = V_NS16550_CLK
-+	.clock = V_NS16550_CLK,
-+	.fcr = UART_FCR_DEFVAL,
- };
- 
- U_BOOT_DEVICE(omap3logic_uart) = {
-diff --git a/board/logicpd/zoom1/zoom1.c b/board/logicpd/zoom1/zoom1.c
-index 2821ee22674f..0fad23af62f6 100644
--- a/board/logicpd/zoom1/zoom1.c
-+++ b/board/logicpd/zoom1/zoom1.c
-@@ -47,7 +47,8 @@ static const u32 gpmc_lab_enet[] = {
- static const struct ns16550_platdata zoom1_serial = {
- 	.base = OMAP34XX_UART3,
- 	.reg_shift = 2,
-	.clock = V_NS16550_CLK
-+	.clock = V_NS16550_CLK,
-+	.fcr = UART_FCR_DEFVAL,
- };
- 
- U_BOOT_DEVICE(zoom1_uart) = {
-diff --git a/board/overo/overo.c b/board/overo/overo.c
-index 40f13e5876cc..5e447262bcfd 100644
--- a/board/overo/overo.c
-+++ b/board/overo/overo.c
-@@ -70,7 +70,8 @@ static struct {
- static const struct ns16550_platdata overo_serial = {
- 	.base = OMAP34XX_UART3,
- 	.reg_shift = 2,
-	.clock = V_NS16550_CLK
-+	.clock = V_NS16550_CLK,
-+	.fcr = UART_FCR_DEFVAL,
- };
- 
- U_BOOT_DEVICE(overo_uart) = {
-diff --git a/board/quipos/cairo/cairo.c b/board/quipos/cairo/cairo.c
-index 77e4482906f0..793aa9023150 100644
--- a/board/quipos/cairo/cairo.c
-+++ b/board/quipos/cairo/cairo.c
-@@ -93,7 +93,8 @@ void get_board_mem_timings(struct board_sdrc_timings *timings)
- static const struct ns16550_platdata cairo_serial = {
- 	.base = OMAP34XX_UART2,
- 	.reg_shift = 2,
-	.clock = V_NS16550_CLK
-+	.clock = V_NS16550_CLK,
-+	.fcr = UART_FCR_DEFVAL,
- };
- 
- U_BOOT_DEVICE(cairo_uart) = {
-diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
-index cfdab3e34253..23c79333a223 100644
--- a/board/ti/beagle/beagle.c
-+++ b/board/ti/beagle/beagle.c
-@@ -75,7 +75,8 @@ static struct {
- static const struct ns16550_platdata beagle_serial = {
- 	.base = OMAP34XX_UART3,
- 	.reg_shift = 2,
-	.clock = V_NS16550_CLK
-+	.clock = V_NS16550_CLK,
-+	.fcr = UART_FCR_DEFVAL,
- };
- 
- U_BOOT_DEVICE(beagle_uart) = {
-diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
-index f785dbe6d732..b2f060b2ddbf 100644
--- a/board/timll/devkit8000/devkit8000.c
-+++ b/board/timll/devkit8000/devkit8000.c
-@@ -48,7 +48,8 @@ static u32 gpmc_net_config[GPMC_MAX_REG] = {
- static const struct ns16550_platdata devkit8000_serial = {
- 	.base = OMAP34XX_UART3,
- 	.reg_shift = 2,
-	.clock = V_NS16550_CLK
-+	.clock = V_NS16550_CLK,
-+	.fcr = UART_FCR_DEFVAL,
- };
- 
- U_BOOT_DEVICE(devkit8000_uart) = {
-diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
-index 9b423a591d8a..2df4a1f04fe5 100644
--- a/drivers/serial/ns16550.c
-+++ b/drivers/serial/ns16550.c
-@@ -20,9 +20,6 @@ DECLARE_GLOBAL_DATA_PTR;
- #define UART_LCRVAL UART_LCR_8N1		/* 8 data, 1 stop, no parity */
- #define UART_MCRVAL (UART_MCR_DTR | \
- 		     UART_MCR_RTS)		/* RTS/DTR */
-#define UART_FCRVAL (UART_FCR_FIFO_EN |	\
-		     UART_FCR_RXSR |	\
-		     UART_FCR_TXSR)		/* Clear & enable FIFOs */
- 
- #ifndef CONFIG_DM_SERIAL
- #ifdef CONFIG_SYS_NS16550_PORT_MAPPED
-@@ -138,7 +135,7 @@ static u32 ns16550_getfcr(NS16550_t port)
- #else
- static u32 ns16550_getfcr(NS16550_t port)
- {
-	return UART_FCRVAL;
-+	return UART_FCR_DEFVAL;
- }
- #endif
- 
-@@ -275,7 +272,7 @@ static inline void _debug_uart_init(void)
- 					    CONFIG_BAUDRATE);
- 	serial_dout(&com_port->ier, CONFIG_SYS_NS16550_IER);
- 	serial_dout(&com_port->mcr, UART_MCRVAL);
-	serial_dout(&com_port->fcr, UART_FCRVAL);
-+	serial_dout(&com_port->fcr, UART_FCR_DEFVAL);
- 
- 	serial_dout(&com_port->lcr, UART_LCR_BKSE | UART_LCRVAL);
- 	serial_dout(&com_port->dll, baud_divisor & 0xff);
-@@ -440,7 +437,7 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
- 		return -EINVAL;
- 	}
- 
-	plat->fcr = UART_FCRVAL;
-+	plat->fcr = UART_FCR_DEFVAL;
- 	if (port_type == PORT_JZ4780)
- 		plat->fcr |= UART_FCR_UME;
- 
-diff --git a/drivers/serial/serial_rockchip.c b/drivers/serial/serial_rockchip.c
-index 6bac95a414ce..c06afc58f7ea 100644
--- a/drivers/serial/serial_rockchip.c
-+++ b/drivers/serial/serial_rockchip.c
-@@ -27,6 +27,7 @@ static int rockchip_serial_probe(struct udevice *dev)
- 	plat->plat.base = plat->dtplat.reg[0];
- 	plat->plat.reg_shift = plat->dtplat.reg_shift;
- 	plat->plat.clock = plat->dtplat.clock_frequency;
-+	plat->plat.fcr = UART_FCR_DEFVAL;
- 	dev->platdata = &plat->plat;
- 
- 	return ns16550_serial_probe(dev);
-diff --git a/include/ns16550.h b/include/ns16550.h
-index 7c9703683109..5fcbcd2e74e3 100644
--- a/include/ns16550.h
-+++ b/include/ns16550.h
-@@ -121,6 +121,11 @@ typedef struct NS16550 *NS16550_t;
- /* Ingenic JZ47xx specific UART-enable bit. */
- #define UART_FCR_UME		0x10
- 
-+/* Clear & enable FIFOs */
-+#define UART_FCR_DEFVAL (UART_FCR_FIFO_EN | \
-+			UART_FCR_RXSR |	\
-+			UART_FCR_TXSR)
-+
- /*
-  * These are the definitions for the Modem Control Register
-  */
-- 
-2.17.0
-
--- a/package/boot/uboot-omap/patches/106-backport-from-upstream-b08c8c4870831c9315dcae2377722.patch
+++ b/package/boot/uboot-omap/patches/106-backport-from-upstream-b08c8c4870831c9315dcae2377722.patch
--- a/package/boot/uboot-omap/patches/107-tools-include-necessary-headers-explicitly.patch
+++ b/package/boot/uboot-omap/patches/107-tools-include-necessary-headers-explicitly.patch
@ -1,75 +0,0 @@
-From ad23f45b346f196e07ba49d354a12762f19abfa4 Mon Sep 17 00:00:00 2001
-From: Masahiro Yamada <yamada.masahiro@socionext.com>
-Date: Sun, 21 Jan 2018 19:19:15 +0900
-Subject: [PATCH 2/2] tools: include necessary headers explicitly
-
-Several host-tools use "bool" type without including <stdbool.h>.
-This relies on the crappy header inclusion chain.
-
-tools/Makefile has the following line:
-
-  HOST_EXTRACFLAGS += -include $(srctree)/include/libfdt_env.h \
-
-All host-tools are forced to include libfdt_env.h even if they are
-totally unrelated to FDT.  Then, <stdbool.h> is indirectly included
-as follows:
-
-     include/libfdt_env.h
-  -> include/linux/types.h
-  -> <stdbool.h>
-
-I am fixing this horrible crap.  In advance, I need to add necessary
-include directives explicitly.  tools/fdtgrep.c needs more; <fctl.h>
-for open() and <errno.h> for errno.
-
-Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
-Reviewed-by: Simon Glass <sjg@chromium.org>
---
- tools/fdtgrep.c   | 3 +++
- tools/ifdtool.c   | 1 +
- tools/imagetool.h | 1 +
- 3 files changed, 5 insertions(+)
-
-diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c
-index fbe38c824a41..13703fc3b1b9 100644
--- a/tools/fdtgrep.c
-+++ b/tools/fdtgrep.c
-@@ -10,7 +10,10 @@
- 
- #include <assert.h>
- #include <ctype.h>
-+#include <errno.h>
- #include <getopt.h>
-+#include <fcntl.h>
-+#include <stdbool.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-diff --git a/tools/ifdtool.c b/tools/ifdtool.c
-index c805597744bd..e4c2f82c4a1e 100644
--- a/tools/ifdtool.c
-+++ b/tools/ifdtool.c
-@@ -12,6 +12,7 @@
- #include <assert.h>
- #include <fcntl.h>
- #include <getopt.h>
-+#include <stdbool.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-diff --git a/tools/imagetool.h b/tools/imagetool.h
-index 15c2a0c0e1c1..076e5e0dc8f9 100644
--- a/tools/imagetool.h
-+++ b/tools/imagetool.h
-@@ -12,6 +12,7 @@
- #include "os_support.h"
- #include <errno.h>
- #include <fcntl.h>
-+#include <stdbool.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-- 
-2.21.0
-
--- a/package/firmware/am33x-cm3/Makefile
+++ b/package/firmware/am33x-cm3/Makefile
@ -1,42 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=am33x-cm3
-PKG_VERSION:=20130304
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://arago-project.org/git/projects/am33x-cm3.git
-PKG_SOURCE_VERSION:=32cf44e25b5828b87af6dceebc3a49fed5d858ac
-PKG_MIRROR_HASH:=71d4029eed4ef58a1e0beb299d5c876bf0b9a790ecac52aacf1d510f5841d959
-
-PKG_MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-
-PKG_FLAGS:=nonshared
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/am33x-cm3
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  URL:=http://arago-project.org/git/projects/?p=am33x-cm3.git
-  TITLE:=TI AM335x PM firmware
-  DEPENDS:=@TARGET_omap
-endef
-
-define Build/Compile
-	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) -C $(PKG_BUILD_DIR)
-endef
-
-define Package/am33x-cm3/install
-	$(INSTALL_DIR) $(1)/lib/firmware
-	$(CP) $(PKG_BUILD_DIR)/bin/am335x-pm-firmware.bin $(1)/lib/firmware
-endef
-
-$(eval $(call BuildPackage,am33x-cm3))
--- a/package/network/config/netifd/Makefile
+++ b/package/network/config/netifd/Makefile
@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=netifd
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
--- a/package/network/config/netifd/files/etc/uci-defaults/14_migrate-dhcp-release
+++ b/package/network/config/netifd/files/etc/uci-defaults/14_migrate-dhcp-release
@ -0,0 +1,23 @@
+. /lib/functions.sh
+
+migrate_release() {
+	local config="$1"
+	local proto
+	local release
+
+	config_get proto "$config" proto
+	config_get release "$config" release
+
+	[ "$proto" = "dhcp" ] && [ -n "$release" ] && {
+		norelease="$((!$release))"
+		uci_set network "$config" norelease "$norelease"
+		uci_remove network "$config" release
+	}
+
+}
+
+config_load network
+config_foreach migrate_release interface
+commit network
+
+exit 0
--- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
+++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
@ -14,7 +14,7 @@ proto_dhcp_init_config() {
 	proto_config_add_string clientid
 	proto_config_add_string vendorid
 	proto_config_add_boolean 'broadcast:bool'
-	proto_config_add_boolean 'release:bool'
+	proto_config_add_boolean 'norelease:bool'
 	proto_config_add_string 'reqopts:list(string)'
 	proto_config_add_boolean 'defaultreqopts:bool'
 	proto_config_add_string iface6rd
@ -35,8 +35,8 @@ proto_dhcp_setup() {
 	local config="$1"
 	local iface="$2"

-	local ipaddr hostname clientid vendorid broadcast release reqopts defaultreqopts iface6rd sendopts delegate zone6rd zone mtu6rd customroutes classlessroute
-	json_get_vars ipaddr hostname clientid vendorid broadcast release reqopts defaultreqopts iface6rd delegate zone6rd zone mtu6rd customroutes classlessroute
+	local ipaddr hostname clientid vendorid broadcast norelease reqopts defaultreqopts iface6rd sendopts delegate zone6rd zone mtu6rd customroutes classlessroute
+	json_get_vars ipaddr hostname clientid vendorid broadcast norelease reqopts defaultreqopts iface6rd delegate zone6rd zone mtu6rd customroutes classlessroute

 	local opt dhcpopts
 	for opt in $reqopts; do
@ -50,7 +50,7 @@ proto_dhcp_setup() {

 	[ "$defaultreqopts" = 0 ] && defaultreqopts="-o" || defaultreqopts=
 	[ "$broadcast" = 1 ] && broadcast="-B" || broadcast=
-	[ "$release" = 1 ] && release="-R" || release=
+	[ "$norelease" = 1 ] && norelease="" || norelease="-R"
 	[ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C"
 	[ -n "$iface6rd" ] && proto_export "IFACE6RD=$iface6rd"
 	[ "$iface6rd" != 0 -a -f /lib/netifd/proto/6rd.sh ] && append dhcpopts "-O 212"
@ -70,7 +70,7 @@ proto_dhcp_setup() {
 		${ipaddr:+-r $ipaddr} \
 		${hostname:+-x "hostname:$hostname"} \
 		${vendorid:+-V "$vendorid"} \
-		$clientid $defaultreqopts $broadcast $release $dhcpopts
+		$clientid $defaultreqopts $broadcast $norelease $dhcpopts
 }

 proto_dhcp_renew() {
--- a/target/linux/brcm2708/patches-4.19/950-0748-net-bcmgenet-Workaround-for-Pi-4B-network-issue.patch
+++ b/target/linux/brcm2708/patches-4.19/950-0748-net-bcmgenet-Workaround-for-Pi-4B-network-issue.patch
@ -1,69 +0,0 @@
-From 82a6bacc6df57c05093bea3f628d4d0b5f7a49a2 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Fri, 2 Aug 2019 22:25:27 +0100
-Subject: [PATCH 748/806] net: bcmgenet: Workaround for Pi 4B network issue
-
-Some combinations of Pi 4Bs and Ethernet switches don't reliably get a
-DCHP-assigned IP address, leaving the unit with a self=assigned 169.254
-address.
-
-Forcing renegotiation has been found to be an effective workaround, so
-add an automatic renegotiation after the link comes up for the first
-time; enable it with genet.force_reneg=y - by default it is disabled.
-
-See: https://github.com/raspberrypi/linux/issues/3108
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
---
- .../net/ethernet/broadcom/genet/bcmgenet.c    | 22 +++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-@@ -72,6 +72,10 @@
- #define GENET_RDMA_REG_OFF	(priv->hw_params->rdma_offset + \
- 				TOTAL_DESC * DMA_DESC_SIZE)
- 
-+static bool force_reneg = false;
-+module_param(force_reneg, bool, 0444);
-+MODULE_PARM_DESC(force_reneg, "Force a renegotiation after the initial link-up");
-+
- static inline void bcmgenet_writel(u32 value, void __iomem *offset)
- {
- 	/* MIPS chips strapped for BE will automagically configure the
-@@ -2612,6 +2616,7 @@ static void bcmgenet_irq_task(struct wor
- 	unsigned int status;
- 	struct bcmgenet_priv *priv = container_of(
- 			work, struct bcmgenet_priv, bcmgenet_irq_work);
-+	static int first_link = 1;
- 
- 	netif_dbg(priv, intr, priv->dev, "%s\n", __func__);
- 
-@@ -2625,9 +2630,26 @@ static void bcmgenet_irq_task(struct wor
- 		phy_init_hw(priv->dev->phydev);
- 
- 	/* Link UP/DOWN event */
-	if (status & UMAC_IRQ_LINK_EVENT)
-+	if (status & UMAC_IRQ_LINK_EVENT) {
- 		phy_mac_interrupt(priv->dev->phydev);
- 
-+		if (priv->dev->phydev->link && first_link) {
-+			first_link = 0;
-+			/*
-+			 * HACK: Some Pi4Bs, when paired with some switches,
-+			 * come up in a strange state where they are unable to
-+			 * transmit, causing them to fail to get an IP address.
-+			 * Although the failure mechanism is not yet understood,
-+			 * forcing renegotiation at this point has been shown
-+			 * to be effective in avoiding the problem.
-+			 */
-+			if (force_reneg) {
-+				dev_info(&priv->pdev->dev,
-+					"Forcing renegotiation\n");
-+				genphy_restart_aneg(priv->dev->phydev);
-+			}
-+		}
-+	}
- }
- 
- /* bcmgenet_isr1: handle Rx and Tx priority queues */
--- a/target/linux/brcm2708/patches-4.19/950-0754-Revert-net-bcmgenet-Workaround-for-Pi-4B-network-iss.patch
+++ b/target/linux/brcm2708/patches-4.19/950-0754-Revert-net-bcmgenet-Workaround-for-Pi-4B-network-iss.patch
@ -1,60 +0,0 @@
-From 024173b78ac6c6ce9dca879274b1e8a8e9000738 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Fri, 9 Aug 2019 08:52:16 +0100
-Subject: [PATCH 754/806] Revert "net: bcmgenet: Workaround for Pi 4B network
- issue"
-
-This reverts commit 9c0770ea7682a84a22c33410ef6870af258abacc.
---
- .../net/ethernet/broadcom/genet/bcmgenet.c    | 22 -------------------
- 1 file changed, 22 deletions(-)
-
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-@@ -72,10 +72,6 @@
- #define GENET_RDMA_REG_OFF	(priv->hw_params->rdma_offset + \
- 				TOTAL_DESC * DMA_DESC_SIZE)
- 
-static bool force_reneg = false;
-module_param(force_reneg, bool, 0444);
-MODULE_PARM_DESC(force_reneg, "Force a renegotiation after the initial link-up");
-
- static inline void bcmgenet_writel(u32 value, void __iomem *offset)
- {
- 	/* MIPS chips strapped for BE will automagically configure the
-@@ -2616,7 +2612,6 @@ static void bcmgenet_irq_task(struct wor
- 	unsigned int status;
- 	struct bcmgenet_priv *priv = container_of(
- 			work, struct bcmgenet_priv, bcmgenet_irq_work);
-	static int first_link = 1;
- 
- 	netif_dbg(priv, intr, priv->dev, "%s\n", __func__);
- 
-@@ -2630,26 +2625,9 @@ static void bcmgenet_irq_task(struct wor
- 		phy_init_hw(priv->dev->phydev);
- 
- 	/* Link UP/DOWN event */
-	if (status & UMAC_IRQ_LINK_EVENT) {
-+	if (status & UMAC_IRQ_LINK_EVENT)
- 		phy_mac_interrupt(priv->dev->phydev);
- 
-		if (priv->dev->phydev->link && first_link) {
-			first_link = 0;
-			/*
-			 * HACK: Some Pi4Bs, when paired with some switches,
-			 * come up in a strange state where they are unable to
-			 * transmit, causing them to fail to get an IP address.
-			 * Although the failure mechanism is not yet understood,
-			 * forcing renegotiation at this point has been shown
-			 * to be effective in avoiding the problem.
-			 */
-			if (force_reneg) {
-				dev_info(&priv->pdev->dev,
-					"Forcing renegotiation\n");
-				genphy_restart_aneg(priv->dev->phydev);
-			}
-		}
-	}
- }
- 
- /* bcmgenet_isr1: handle Rx and Tx priority queues */
--- a/target/linux/ipq40xx/patches-4.14/040-dmaengine-qcom-bam-Process-multiple-pending-descript.patch
+++ b/target/linux/ipq40xx/patches-4.14/040-dmaengine-qcom-bam-Process-multiple-pending-descript.patch
@ -132,7 +132,7 @@ Signed-off-by: Vinod Koul <vinod.koul@intel.com>
 
 	async_desc->num_desc = num_alloc;
 	async_desc->curr_desc = async_desc->desc;
-@@ -685,29 +688,16 @@ err_out:
+@@ -685,28 +688,16 @@ err_out:
 static int bam_dma_terminate_all(struct dma_chan *chan)
 {
 	struct bam_chan *bchan = to_bam_chan(chan);
@ -159,15 +159,14 @@ Signed-off-by: Vinod Koul <vinod.koul@intel.com>
 -		bam_chan_init_hw(bchan, bchan->curr_txd->dir);
 -		list_add(&bchan->curr_txd->vd.node, &bchan->vc.desc_issued);
 -		bchan->curr_txd = NULL;
-	}
 +	list_for_each_entry_safe(async_desc, tmp,
 +				&bchan->desc_list, desc_node) {
 +		list_add(&async_desc->vd.node, &bchan->vc.desc_issued);
 +		list_del(&async_desc->desc_node);
+ 	}
 
 	vchan_get_all_descriptors(&bchan->vc, &head);
- 	spin_unlock_irqrestore(&bchan->vc.lock, flag);
-@@ -778,9 +768,9 @@ static int bam_resume(struct dma_chan *c
+@@ -778,9 +769,9 @@ static int bam_resume(struct dma_chan *c
  */
 static u32 process_channel_irqs(struct bam_device *bdev)
 {
@ -179,7 +178,7 @@ Signed-off-by: Vinod Koul <vinod.koul@intel.com>
 
 	srcs = readl_relaxed(bam_addr(bdev, 0, BAM_IRQ_SRCS_EE));
 
-@@ -800,27 +790,40 @@ static u32 process_channel_irqs(struct b
+@@ -800,27 +791,40 @@ static u32 process_channel_irqs(struct b
 		writel_relaxed(pipe_stts, bam_addr(bdev, i, BAM_P_IRQ_CLR));
 
 		spin_lock_irqsave(&bchan->vc.lock, flags);
@ -229,7 +228,7 @@ Signed-off-by: Vinod Koul <vinod.koul@intel.com>
 		}
 
 		spin_unlock_irqrestore(&bchan->vc.lock, flags);
-@@ -882,6 +885,7 @@ static enum dma_status bam_tx_status(str
+@@ -882,6 +886,7 @@ static enum dma_status bam_tx_status(str
 		struct dma_tx_state *txstate)
 {
 	struct bam_chan *bchan = to_bam_chan(chan);
@ -237,7 +236,7 @@ Signed-off-by: Vinod Koul <vinod.koul@intel.com>
 	struct virt_dma_desc *vd;
 	int ret;
 	size_t residue = 0;
-@@ -897,11 +901,17 @@ static enum dma_status bam_tx_status(str
+@@ -897,11 +902,17 @@ static enum dma_status bam_tx_status(str
 
 	spin_lock_irqsave(&bchan->vc.lock, flags);
 	vd = vchan_find_desc(&bchan->vc, cookie);
@ -259,7 +258,7 @@ Signed-off-by: Vinod Koul <vinod.koul@intel.com>
 
 	spin_unlock_irqrestore(&bchan->vc.lock, flags);
 
-@@ -942,63 +952,86 @@ static void bam_start_dma(struct bam_cha
+@@ -942,63 +953,86 @@ static void bam_start_dma(struct bam_cha
 {
 	struct virt_dma_desc *vd = vchan_next_desc(&bchan->vc);
 	struct bam_device *bdev = bchan->bdev;
@ -382,7 +381,7 @@ Signed-off-by: Vinod Koul <vinod.koul@intel.com>
 
 	/* ensure descriptor writes and dma start not reordered */
 	wmb();
-@@ -1027,7 +1060,7 @@ static void dma_tasklet(unsigned long da
+@@ -1027,7 +1061,7 @@ static void dma_tasklet(unsigned long da
 		bchan = &bdev->channels[i];
 		spin_lock_irqsave(&bchan->vc.lock, flags);
 
@ -391,7 +390,7 @@ Signed-off-by: Vinod Koul <vinod.koul@intel.com>
 			bam_start_dma(bchan);
 		spin_unlock_irqrestore(&bchan->vc.lock, flags);
 	}
-@@ -1048,7 +1081,7 @@ static void bam_issue_pending(struct dma
+@@ -1048,7 +1082,7 @@ static void bam_issue_pending(struct dma
 	spin_lock_irqsave(&bchan->vc.lock, flags);
 
 	/* if work pending and idle, start a transaction */
@ -400,7 +399,7 @@ Signed-off-by: Vinod Koul <vinod.koul@intel.com>
 		bam_start_dma(bchan);
 
 	spin_unlock_irqrestore(&bchan->vc.lock, flags);
-@@ -1152,6 +1185,7 @@ static void bam_channel_init(struct bam_
+@@ -1152,6 +1186,7 @@ static void bam_channel_init(struct bam_
 
 	vchan_init(&bchan->vc, &bdev->common);
 	bchan->vc.desc_free = bam_dma_free_desc;
--- a/target/linux/omap/Makefile
+++ b/target/linux/omap/Makefile
@ -14,7 +14,7 @@ FEATURES:=usb usbgadget ext4 targz fpu audio display nand squashfs
 CPU_TYPE:=cortex-a8
 CPU_SUBTYPE:=vfpv3

-KERNEL_PATCHVER:=4.14
+KERNEL_PATCHVER:=4.19

 MAINTAINER:=Alexander Couzens <lynxis@fe80.eu>

--- a/target/linux/omap/config-4.19
+++ b/target/linux/omap/config-4.19
@ -0,0 +1,763 @@
+# CONFIG_AHCI_DM816 is not set
+CONFIG_ALIGNMENT_TRAP=y
+CONFIG_AM335X_CONTROL_USB=y
+CONFIG_AM335X_PHY_USB=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_ARCH_HAS_BANDGAP=y
+CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_ARCH_HAS_PHYS_TO_DMA=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_HAS_SG_CHAIN=y
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_ARCH_HAS_TICK_BROADCAST=y
+CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_ARCH_MULTIPLATFORM=y
+CONFIG_ARCH_MULTI_V6_V7=y
+CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
+CONFIG_ARCH_NR_GPIO=0
+CONFIG_ARCH_OMAP=y
+CONFIG_ARCH_OMAP2PLUS=y
+CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
+CONFIG_ARCH_OMAP3=y
+CONFIG_ARCH_OMAP4=y
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_ARM=y
+CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
+# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
+CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
+CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_ARM_ERRATA_430973=y
+CONFIG_ARM_ERRATA_720789=y
+CONFIG_ARM_ERRATA_754322=y
+CONFIG_ARM_ERRATA_775420=y
+CONFIG_ARM_GIC=y
+CONFIG_ARM_HAS_SG_CHAIN=y
+CONFIG_ARM_HEAVY_MB=y
+CONFIG_ARM_L1_CACHE_SHIFT=6
+CONFIG_ARM_L1_CACHE_SHIFT_6=y
+# CONFIG_ARM_LPAE is not set
+CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
+CONFIG_ARM_PATCH_IDIV=y
+CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_ARM_THUMB=y
+CONFIG_ARM_THUMBEE=y
+CONFIG_ARM_TI_CPUFREQ=y
+CONFIG_ARM_VIRT_EXT=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_AT803X_PHY=y
+CONFIG_ATA=y
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_GENERIC=y
+CONFIG_AUDIT_TREE=y
+CONFIG_AUDIT_WATCH=y
+CONFIG_AUTO_ZRELADDR=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# CONFIG_BACKLIGHT_TPS65217 is not set
+CONFIG_BCH=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_SCSI_REQUEST=y
+CONFIG_BOUNCE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BUILD_BIN2C=y
+CONFIG_CACHE_L2X0=y
+CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CEC_CORE=y
+# CONFIG_CHARGER_TPS65217 is not set
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_CLKSRC_MMIO=y
+CONFIG_CLKSRC_TI_32K=y
+CONFIG_CLK_TWL6040=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_CMA=y
+CONFIG_CMA_ALIGNMENT=8
+CONFIG_CMA_AREAS=7
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_SIZE_MBYTES=16
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
+CONFIG_COMMON_CLK=y
+# CONFIG_COMMON_CLK_PALMAS is not set
+# CONFIG_COMMON_CLK_TI_ADPLL is not set
+CONFIG_CONFIGFS_FS=y
+CONFIG_CONNECTOR=y
+CONFIG_CPUFREQ_DT=y
+CONFIG_CPUFREQ_DT_PLATDEV=y
+CONFIG_CPU_32v6K=y
+CONFIG_CPU_32v7=y
+CONFIG_CPU_ABRT_EV7=y
+# CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_CPU_CACHE_V7=y
+CONFIG_CPU_CACHE_VIPT=y
+CONFIG_CPU_COPY_V6=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_GOV_ATTR_SET=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_HAS_ASID=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_PABRT_V7=y
+CONFIG_CPU_PM=y
+CONFIG_CPU_RMAP=y
+CONFIG_CPU_SPECTRE=y
+CONFIG_CPU_THERMAL=y
+CONFIG_CPU_THUMB_CAPABLE=y
+CONFIG_CPU_TLB_V7=y
+CONFIG_CPU_V7=y
+CONFIG_CRAMFS=y
+CONFIG_CRC16=y
+CONFIG_CRC7=y
+CONFIG_CRC_CCITT=y
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CRC32=y
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CTR=y
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_DEV_OMAP=y
+CONFIG_CRYPTO_DEV_OMAP_AES=y
+CONFIG_CRYPTO_DEV_OMAP_DES=y
+CONFIG_CRYPTO_DEV_OMAP_SHAM=y
+CONFIG_CRYPTO_DRBG=y
+CONFIG_CRYPTO_DRBG_HMAC=y
+CONFIG_CRYPTO_DRBG_MENU=y
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_ENGINE=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=y
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_DDR=y
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
+# CONFIG_DEBUG_USER is not set
+CONFIG_DM9000=y
+# CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set
+CONFIG_DMADEVICES=y
+CONFIG_DMA_CMA=y
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_OF=y
+CONFIG_DMA_OMAP=y
+CONFIG_DMA_SHARED_BUFFER=y
+CONFIG_DMA_VIRTUAL_CHANNELS=y
+CONFIG_DNS_RESOLVER=y
+CONFIG_DRM=y
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_KMS_HELPER=y
+CONFIG_DRM_OMAP=y
+CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=y
+CONFIG_DRM_OMAP_CONNECTOR_DVI=y
+CONFIG_DRM_OMAP_CONNECTOR_HDMI=y
+# CONFIG_DRM_OMAP_ENCODER_OPA362 is not set
+CONFIG_DRM_OMAP_ENCODER_TFP410=y
+CONFIG_DRM_OMAP_ENCODER_TPD12S015=y
+CONFIG_DRM_OMAP_PANEL_DPI=y
+CONFIG_DRM_OMAP_PANEL_DSI_CM=y
+CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02=y
+CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11=y
+CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01=y
+CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM=y
+CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1=y
+CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1=y
+CONFIG_DRM_PANEL=y
+CONFIG_DRM_PANEL_BRIDGE=y
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+# CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_TVE200 is not set
+CONFIG_DTC=y
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+CONFIG_EEPROM_93CX6=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_EXT4_FS=y
+CONFIG_EXTCON=y
+CONFIG_EXTCON_PALMAS=y
+CONFIG_EXTCON_USB_GPIO=y
+# CONFIG_F2FS_CHECK_FS is not set
+CONFIG_F2FS_FS=y
+# CONFIG_F2FS_FS_SECURITY is not set
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_STAT_FS=y
+CONFIG_FANOTIFY=y
+CONFIG_FAT_FS=y
+CONFIG_FB_CMDLINE=y
+CONFIG_FHANDLE=y
+CONFIG_FIXED_PHY=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_FRAME_POINTER=y
+CONFIG_FS_IOMAP=y
+CONFIG_FS_MBCACHE=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_GENERIC_ARCH_TOPOLOGY=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_EARLY_IOREMAP=y
+CONFIG_GENERIC_IDLE_POLL_SETUP=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_PHY=y
+CONFIG_GENERIC_PINCONF=y
+CONFIG_GENERIC_PINCTRL_GROUPS=y
+CONFIG_GENERIC_PINMUX_FUNCTIONS=y
+CONFIG_GENERIC_SCHED_CLOCK=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GLOB=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_IRQCHIP=y
+CONFIG_GPIO_OMAP=y
+CONFIG_GPIO_PALMAS=y
+CONFIG_GPIO_PCA953X=y
+CONFIG_GPIO_PCA953X_IRQ=y
+CONFIG_GPIO_PCF857X=y
+CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_TPS65218 is not set
+CONFIG_GPIO_TPS65910=y
+CONFIG_GPIO_TWL4030=y
+CONFIG_GPIO_TWL6040=y
+CONFIG_GRACE_PERIOD=y
+CONFIG_GRO_CELLS=y
+CONFIG_HANDLE_DOMAIN_IRQ=y
+CONFIG_HARDEN_BRANCH_PREDICTOR=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_HAS_DMA=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_HAVE_ARCH_BITREVERSE=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_HAVE_ARCH_PFN_VALID=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_ARM_SCU=y
+CONFIG_HAVE_ARM_SMCCC=y
+CONFIG_HAVE_ARM_TWD=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_EBPF_JIT=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_HAVE_OPROFILE=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_PROC_CPU=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_SMP=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_UID16=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HDMI=y
+CONFIG_HIGHMEM=y
+CONFIG_HIGHPTE=y
+CONFIG_HSI=y
+CONFIG_HSI_BOARDINFO=y
+# CONFIG_HSI_CHAR is not set
+CONFIG_HWMON=y
+CONFIG_HZ_FIXED=0
+CONFIG_I2C=y
+CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_OMAP=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_IRQCHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_IRQ_WORK=y
+CONFIG_JBD2=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RUBIN=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_KEYS=y
+CONFIG_KPROBES=y
+CONFIG_KRETPROBES=y
+CONFIG_KS8851=y
+CONFIG_KS8851_MLL=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_LCD_PLATFORM=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_PWM=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LIBCRC32C=y
+CONFIG_LIBFDT=y
+CONFIG_LOCKD=y
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+# CONFIG_MACH_OMAP3517EVM is not set
+# CONFIG_MACH_OMAP3_PANDORA is not set
+CONFIG_MACH_OMAP_GENERIC=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MDIO_BUS=y
+CONFIG_MDIO_DEVICE=y
+CONFIG_MEMFD_CREATE=y
+CONFIG_MEMORY=y
+CONFIG_MEMORY_ISOLATION=y
+CONFIG_MFD_CORE=y
+CONFIG_MFD_PALMAS=y
+CONFIG_MFD_SYSCON=y
+CONFIG_MFD_TI_AM335X_TSCADC=y
+CONFIG_MFD_TPS65217=y
+CONFIG_MFD_TPS65218=y
+CONFIG_MFD_TPS65910=y
+CONFIG_MFD_TWL4030_AUDIO=y
+CONFIG_MIGHT_HAVE_CACHE_L2X0=y
+CONFIG_MIGHT_HAVE_PCI=y
+CONFIG_MIGRATION=y
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK=y
+# CONFIG_MMC_OMAP is not set
+CONFIG_MMC_OMAP_HS=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_MSDOS_FS=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_M25P80=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_BCH=y
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_BCH=y
+CONFIG_MTD_NAND_OMAP2=y
+CONFIG_MTD_NAND_OMAP_BCH=y
+CONFIG_MTD_NAND_OMAP_BCH_BUILD=y
+CONFIG_MTD_ONENAND=y
+# CONFIG_MTD_ONENAND_2X_PROGRAM is not set
+# CONFIG_MTD_ONENAND_GENERIC is not set
+CONFIG_MTD_ONENAND_OMAP2=y
+# CONFIG_MTD_ONENAND_OTP is not set
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_OOPS=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_BLOCK is not set
+# CONFIG_MTD_UBI_FASTMAP is not set
+# CONFIG_MTD_UBI_GLUEBI is not set
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+# CONFIG_MUSB_PIO_ONLY is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEON=y
+CONFIG_NET_FLOW_LIMIT=y
+CONFIG_NET_KEY=y
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_NET_PTP_CLASSIFY=y
+CONFIG_NFS_ACL_SUPPORT=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_USE_KERNEL_DNS=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_NLS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NOP_USB_XCEIV=y
+CONFIG_NO_BOOTMEM=y
+CONFIG_NO_HZ=y
+CONFIG_NO_HZ_COMMON=y
+CONFIG_NO_HZ_IDLE=y
+CONFIG_NR_CPUS=4
+CONFIG_NVMEM=y
+CONFIG_OF=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_GPIO=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_KOBJ=y
+CONFIG_OF_MDIO=y
+CONFIG_OF_NET=y
+CONFIG_OF_RESERVED_MEM=y
+CONFIG_OID_REGISTRY=y
+CONFIG_OLD_SIGACTION=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_OMAP2_DSS=y
+CONFIG_OMAP2_DSS_DPI=y
+CONFIG_OMAP2_DSS_DSI=y
+CONFIG_OMAP2_DSS_HDMI_COMMON=y
+CONFIG_OMAP2_DSS_INIT=y
+CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
+CONFIG_OMAP2_DSS_SDI=y
+CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
+CONFIG_OMAP2_DSS_VENC=y
+# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
+# CONFIG_OMAP3_SDRC_AC_TIMING is not set
+CONFIG_OMAP3_THERMAL=y
+CONFIG_OMAP4_DSS_HDMI=y
+CONFIG_OMAP4_DSS_HDMI_CEC=y
+CONFIG_OMAP4_THERMAL=y
+CONFIG_OMAP5_DSS_HDMI=y
+CONFIG_OMAP_32K_TIMER=y
+CONFIG_OMAP_CONTROL_PHY=y
+CONFIG_OMAP_DM_TIMER=y
+CONFIG_OMAP_DSS_BASE=y
+CONFIG_OMAP_GPMC=y
+# CONFIG_OMAP_GPMC_DEBUG is not set
+CONFIG_OMAP_INTERCONNECT=y
+CONFIG_OMAP_INTERCONNECT_BARRIER=y
+CONFIG_OMAP_IRQCHIP=y
+CONFIG_OMAP_OCP2SCP=y
+CONFIG_OMAP_RESET_CLOCKS=y
+# CONFIG_OMAP_SSI is not set
+CONFIG_OMAP_USB2=y
+CONFIG_OMAP_WATCHDOG=y
+CONFIG_OPROFILE=y
+CONFIG_OPTPROBES=y
+CONFIG_OUTER_CACHE=y
+CONFIG_OUTER_CACHE_SYNC=y
+CONFIG_PADATA=y
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_PERF_USE_VMALLOC=y
+CONFIG_PGTABLE_LEVELS=2
+CONFIG_PHYLIB=y
+# CONFIG_PHY_DM816X_USB is not set
+CONFIG_PINCTRL=y
+# CONFIG_PINCTRL_PALMAS is not set
+CONFIG_PL310_ERRATA_588369=y
+CONFIG_PL310_ERRATA_727915=y
+# CONFIG_PL310_ERRATA_753970 is not set
+# CONFIG_PL310_ERRATA_769419 is not set
+CONFIG_PM=y
+CONFIG_PM_CLK=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_OPP=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_POWER_AVS=y
+CONFIG_POWER_AVS_OMAP=y
+CONFIG_POWER_AVS_OMAP_CLASS3=y
+CONFIG_POWER_SUPPLY=y
+CONFIG_PPS=y
+CONFIG_PRINTK_TIME=y
+CONFIG_PRINT_QUOTA_WARNING=y
+CONFIG_PROC_EVENTS=y
+CONFIG_PROFILING=y
+CONFIG_PTP_1588_CLOCK=y
+CONFIG_PWM=y
+# CONFIG_PWM_OMAP_DMTIMER is not set
+CONFIG_PWM_SYSFS=y
+CONFIG_PWM_TIECAP=y
+CONFIG_PWM_TIEHRPWM=y
+CONFIG_PWM_TIPWMSS=y
+# CONFIG_PWM_TWL is not set
+# CONFIG_PWM_TWL_LED is not set
+# CONFIG_QFMT_V1 is not set
+CONFIG_QFMT_V2=y
+CONFIG_QUOTA=y
+CONFIG_QUOTACTL=y
+# CONFIG_QUOTA_NETLINK_INTERFACE is not set
+CONFIG_QUOTA_TREE=y
+CONFIG_RATIONAL=y
+CONFIG_RCU_NEED_SEGCBLIST=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_REFCOUNT_FULL=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_SPI=y
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_PALMAS=y
+CONFIG_REGULATOR_PBIAS=y
+CONFIG_REGULATOR_TI_ABB=y
+CONFIG_REGULATOR_TPS62360=y
+CONFIG_REGULATOR_TPS65023=y
+CONFIG_REGULATOR_TPS6507X=y
+CONFIG_REGULATOR_TPS65217=y
+CONFIG_REGULATOR_TPS65218=y
+CONFIG_REGULATOR_TPS65910=y
+CONFIG_REGULATOR_TWL4030=y
+CONFIG_RFS_ACCEL=y
+CONFIG_RING_BUFFER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_ROOT_NFS=y
+CONFIG_RPS=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_DS1307=y
+CONFIG_RTC_DRV_OMAP=y
+CONFIG_RTC_DRV_PALMAS=y
+# CONFIG_RTC_DRV_TPS65910 is not set
+CONFIG_RTC_DRV_TWL4030=y
+CONFIG_RTC_I2C_AND_SPI=y
+CONFIG_RTC_MC146818_LIB=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_SCHEDSTATS=y
+CONFIG_SCHED_INFO=y
+CONFIG_SCHED_MC=y
+CONFIG_SCSI=y
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SDIO_UART=y
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_SENSORS_GPIO_FAN=y
+CONFIG_SENSORS_LM75=y
+CONFIG_SENSORS_TMP102=y
+CONFIG_SENSORS_TSL2550=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_FSL=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_NR_UARTS=32
+# CONFIG_SERIAL_8250_OMAP is not set
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_SERIAL_OMAP=y
+CONFIG_SERIAL_OMAP_CONSOLE=y
+CONFIG_SERIO=y
+CONFIG_SGL_ALLOC=y
+CONFIG_SG_POOL=y
+CONFIG_SG_SPLIT=y
+CONFIG_SMC91X=y
+CONFIG_SMP=y
+CONFIG_SMP_ON_UP=y
+CONFIG_SMSC911X=y
+CONFIG_SMSC_PHY=y
+CONFIG_SND=y
+CONFIG_SND_AM33XX_SOC_EVM=y
+# CONFIG_SND_COMPRESS_OFFLOAD is not set
+CONFIG_SND_DAVINCI_SOC_GENERIC_EVM=y
+# CONFIG_SND_DAVINCI_SOC_I2S is not set
+CONFIG_SND_DAVINCI_SOC_MCASP=y
+CONFIG_SND_DMAENGINE_PCM=y
+CONFIG_SND_EDMA_SOC=y
+CONFIG_SND_JACK=y
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_OMAP_SOC=y
+CONFIG_SND_OMAP_SOC_DMIC=y
+CONFIG_SND_OMAP_SOC_HDMI_AUDIO=y
+CONFIG_SND_OMAP_SOC_MCBSP=y
+CONFIG_SND_OMAP_SOC_MCPDM=y
+CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=y
+CONFIG_SND_OMAP_SOC_OMAP_TWL4030=y
+# CONFIG_SND_OMAP_SOC_RX51 is not set
+CONFIG_SND_PCM=y
+CONFIG_SND_PCM_OSS=y
+CONFIG_SND_SDMA_SOC=y
+CONFIG_SND_SIMPLE_CARD=y
+CONFIG_SND_SIMPLE_CARD_UTILS=y
+CONFIG_SND_SOC=y
+CONFIG_SND_SOC_DMIC=y
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_I2C_AND_SPI=y
+CONFIG_SND_SOC_TLV320AIC3X=y
+CONFIG_SND_SOC_TWL4030=y
+CONFIG_SND_SOC_TWL6040=y
+CONFIG_SND_VERBOSE_PRINTK=y
+CONFIG_SOC_AM33XX=y
+CONFIG_SOC_AM43XX=y
+CONFIG_SOC_BUS=y
+CONFIG_SOC_HAS_OMAP2_SDRC=y
+CONFIG_SOC_OMAP3430=y
+# CONFIG_SOC_TI81XX is not set
+CONFIG_SOUND=y
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
+CONFIG_SPI_OMAP24XX=y
+CONFIG_SPI_TI_QSPI=y
+CONFIG_SRAM=y
+CONFIG_SRAM_EXEC=y
+CONFIG_SRCU=y
+CONFIG_STACKTRACE=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_SWPHY=y
+CONFIG_SWP_EMULATE=y
+CONFIG_SYNC_FILE=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_THERMAL=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+CONFIG_THERMAL_OF=y
+# CONFIG_THUMB2_KERNEL is not set
+CONFIG_TICK_CPU_ACCOUNTING=y
+CONFIG_TIMER_OF=y
+CONFIG_TIMER_PROBE=y
+CONFIG_TI_CPPI41=y
+CONFIG_TI_CPSW=y
+CONFIG_TI_CPSW_ALE=y
+CONFIG_TI_CPSW_PHY_SEL=y
+CONFIG_TI_CPTS=y
+CONFIG_TI_CPTS_MOD=y
+CONFIG_TI_DAVINCI_CPDMA=y
+CONFIG_TI_DAVINCI_EMAC=y
+CONFIG_TI_DAVINCI_MDIO=y
+CONFIG_TI_DMA_CROSSBAR=y
+CONFIG_TI_EDMA=y
+CONFIG_TI_EMIF=y
+# CONFIG_TI_EMIF_SRAM is not set
+CONFIG_TI_PIPE3=y
+CONFIG_TI_SOC_THERMAL=y
+CONFIG_TI_SYSC=y
+CONFIG_TI_THERMAL=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_TREE_RCU=y
+CONFIG_TREE_SRCU=y
+CONFIG_TWL4030_CORE=y
+CONFIG_TWL4030_POWER=y
+CONFIG_TWL4030_USB=y
+CONFIG_TWL4030_WATCHDOG=y
+# CONFIG_TWL6030_USB is not set
+CONFIG_TWL6040_CORE=y
+CONFIG_UBIFS_FS=y
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
+CONFIG_USB=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_DUAL_ROLE=y
+# CONFIG_USB_DWC3_GADGET is not set
+# CONFIG_USB_DWC3_HOST is not set
+CONFIG_USB_DWC3_OMAP=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD_OMAP=y
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+CONFIG_USB_GADGET=y
+CONFIG_USB_INVENTRA_DMA=y
+CONFIG_USB_MUSB_AM335X_CHILD=y
+CONFIG_USB_MUSB_AM35X=y
+CONFIG_USB_MUSB_DSPS=y
+CONFIG_USB_MUSB_DUAL_ROLE=y
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_HDRC=y
+# CONFIG_USB_MUSB_HOST is not set
+CONFIG_USB_MUSB_OMAP2PLUS=y
+CONFIG_USB_MUSB_TUSB6010=y
+CONFIG_USB_PHY=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_TI_CPPI41_DMA=y
+CONFIG_USB_TUSB_OMAP_DMA=y
+# CONFIG_USERIO is not set
+CONFIG_USE_OF=y
+CONFIG_VFAT_FS=y
+CONFIG_VFP=y
+CONFIG_VFPv3=y
+CONFIG_VIDEOMODE_HELPERS=y
+CONFIG_WATCHDOG_CORE=y
+CONFIG_XFRM_ALGO=y
+CONFIG_XFRM_MIGRATE=y
+CONFIG_XPS=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_ZLIB_INFLATE=y
--- a/target/linux/omap/image/Makefile
+++ b/target/linux/omap/image/Makefile
@ -19,7 +19,7 @@ define Build/omap-sdcard

 	mcopy -i $@.boot $(STAGING_DIR_IMAGE)/$(DEVICE_NAME)/MLO ::MLO
 	mcopy -i $@.boot $(STAGING_DIR_IMAGE)/$(DEVICE_NAME)/u-boot.img ::u-boot.img
-	mcopy -i $@.boot $(STAGING_DIR_IMAGE)/$(DEVICE_NAME)/uEnv.txt ::uEnv.txt
+	mcopy -i $@.boot $(STAGING_DIR_IMAGE)/$(DEVICE_NAME)/boot.scr ::boot.scr
 	mmd -i $@.boot ::/dtbs
 	mcopy -i $@.boot $(DTS_DIR)/$(DEVICE_DTS).dtb ::/dtbs/$(DEVICE_DTS).dtb
 	mcopy -i $@.boot $(IMAGE_KERNEL) ::/zImage