Merge git://git.denx.de/u-boot-sunxi

diff --git a/Makefile b/Makefile
index 4981a2ed6f4ab16200fe347161c3f0774393f40e..71952195036049fb4a6a9401963a06ae9a0cb38f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1053,6 +1053,7 @@ u-boot-dtb.img u-boot.img u-boot.kwb u-boot.pbl u-boot-ivt.img: \
 
 u-boot.itb: u-boot-nodtb.bin dts/dt.dtb $(U_BOOT_ITS) FORCE
        $(call if_changed,mkfitimage)
+       $(BOARD_SIZE_CHECK)
 
 u-boot-spl.kwb: u-boot.img spl/u-boot-spl.bin FORCE
        $(call if_changed,mkimage)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f6d57f5505ffb88f633ea9dd2895961ec85463d9..73fbd54edb3838a49f584ebb5458f3ff3f3dac42 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -746,6 +746,7 @@ config ARCH_SUNXI
        select USE_TINY_PRINTF
        imply CMD_GPT
        imply FAT_WRITE
+       imply OF_LIBFDT_OVERLAY
        imply PRE_CONSOLE_BUFFER
        imply SPL_GPIO_SUPPORT
        imply SPL_LIBCOMMON_SUPPORT

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 35fe9d50016b0c54226fbf4acf9b21e41427a39a..676011dcdc4c258d6eced7869c7176f3264bcd88 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -397,6 +397,7 @@ menu "Memory commands"
 config CMD_CRC32
        bool "crc32"
        select HASH
+       default n if ARCH_SUNXI
        default y
        help
          Compute CRC32.
@@ -538,6 +539,7 @@ config CMD_LZMADEC
 
 config CMD_UNZIP
        bool "unzip"
+       default n if ARCH_SUNXI
        default y if CMD_BOOTI
        help
          Uncompress a zip-compressed memory region.
@@ -746,12 +748,14 @@ config CMD_I2C
 
 config CMD_LOADB
        bool "loadb"
+       default n if ARCH_SUNXI
        default y
        help
          Load a binary file over serial line.
 
 config CMD_LOADS
        bool "loads"
+       default n if ARCH_SUNXI
        default y
        help
          Load an S-Record file over serial line
@@ -1134,6 +1138,7 @@ config CMD_GETTIME
 # TODO: rename to CMD_SLEEP
 config CMD_MISC
        bool "sleep"
+       default n if ARCH_SUNXI
        default y
        help
          Delay execution for some time

diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig
index 062ac76e6d660b0ab54aecf3bbd001ab29660c94..2452d42a873c54a1f31f1f7c5f8d2ebd71bcb3cb 100644 (file)
--- a/configs/CHIP_defconfig
+++ b/configs/CHIP_defconfig
@@ -20,4 +20,3 @@ CONFIG_AXP_ALDO4_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_OF_LIBFDT_OVERLAY=y

diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig
index f47aead6f904f40cf1a2520a608c277f6efa4d85..02e79b5bb510a289061e9840dd4f6c0161f88f1b 100644 (file)
--- a/configs/CHIP_pro_defconfig
+++ b/configs/CHIP_pro_defconfig
@@ -25,4 +25,3 @@ CONFIG_AXP_ALDO4_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_OF_LIBFDT_OVERLAY=y

diff --git a/drivers/dfu/Kconfig b/drivers/dfu/Kconfig
index 56a98f5273cea7103e30dcce6f8ceef56055a575..fa27efbb405398435797e08b7e607b5ea4d9a065 100644 (file)
--- a/drivers/dfu/Kconfig
+++ b/drivers/dfu/Kconfig
@@ -2,6 +2,7 @@ menu "DFU support"
 
 config USB_FUNCTION_DFU
        bool
+       select HASH
 
 if CMD_DFU
 config DFU_TFTP

diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c
index b47cc66c583a2b1d22c00d408cfca0f03c0e5d82..3cf01b6e36939288bb4666d0092470987a729b17 100644 (file)
--- a/drivers/gpio/sunxi_gpio.c
+++ b/drivers/gpio/sunxi_gpio.c
@@ -345,6 +345,7 @@ static const struct udevice_id sunxi_gpio_ids[] = {
        ID("allwinner,sun4i-a10-pinctrl",       a_all),
        ID("allwinner,sun5i-a10s-pinctrl",      a_all),
        ID("allwinner,sun5i-a13-pinctrl",       a_all),
+       ID("allwinner,sun50i-h5-pinctrl",       a_all),
        ID("allwinner,sun6i-a31-pinctrl",       a_all),
        ID("allwinner,sun6i-a31s-pinctrl",      a_all),
        ID("allwinner,sun7i-a20-pinctrl",       a_all),

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 45a105db06ae0551017b7488f8a8b5c97495d587..2fc0defcd0d1d01b462ea7404980fe629f202851 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -38,6 +38,7 @@ config BACKLIGHT_GPIO
 config VIDEO_BPP8
        bool "Support 8-bit-per-pixel displays"
        depends on DM_VIDEO
+       default n if ARCH_SUNXI
        default y if DM_VIDEO
        help
          Support drawing text and bitmaps onto a 8-bit-per-pixel display.
@@ -48,6 +49,7 @@ config VIDEO_BPP8
 config VIDEO_BPP16
        bool "Support 16-bit-per-pixel displays"
        depends on DM_VIDEO
+       default n if ARCH_SUNXI
        default y if DM_VIDEO
        help
          Support drawing text and bitmaps onto a 16-bit-per-pixel display.

diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c
index 0630289c0a194f925dd8ad18f698a03599e66820..f191ef16c637900d5e44e05cb29489439bd5912f 100644 (file)
--- a/drivers/video/sunxi/sunxi_display.c
+++ b/drivers/video/sunxi/sunxi_display.c
@@ -625,6 +625,8 @@ static void sunxi_ctfb_mode_to_display_timing(const struct ctfb_res_modes *mode,
        timing->vback_porch.typ = mode->upper_margin;
        timing->vsync_len.typ = mode->vsync_len;
 
+       timing->flags = 0;
+
        if (mode->sync & FB_SYNC_HOR_HIGH_ACT)
                timing->flags |= DISPLAY_FLAGS_HSYNC_HIGH;
        else

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 582aba298af921c1e1bae96f642a0226f366f2c4..9b3944ad1309b7afb534b26af1a3d95be657d912 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -147,6 +147,16 @@
 #endif
 
 #if defined(CONFIG_ENV_IS_IN_MMC)
+
+#ifdef CONFIG_ARM64
+/*
+ * This is actually (CONFIG_ENV_OFFSET -
+ * (CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)), but the value will be used
+ * directly in a makefile, without the preprocessor expansion.
+ */
+#define CONFIG_BOARD_SIZE_LIMIT                0x7e000
+#endif
+
 #if CONFIG_MMC_SUNXI_SLOT_EXTRA != -1
 /* If we have two devices (most likely eMMC + MMC), favour the eMMC */
 #define CONFIG_SYS_MMC_ENV_DEV         1

diff --git a/lib/Kconfig b/lib/Kconfig
index 00ac650e741dca33d2d672375b24076c6509ee03..710deb7a630306dbb088517117e4e09beb86de85 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -57,6 +57,7 @@ config PANIC_HANG
 
 config REGEX
        bool "Enable regular expression support"
+       default n if ARCH_SUNXI
        default y if NET
        help
          If this variable is defined, U-Boot is linked against the