Merge branch 'master' of git://git.denx.de/u-boot-usb

- Documentation fix

diff --git a/.travis.yml b/.travis.yml
index 834502fc8c1099f060c2ae749186d13591d389dd..eb531f1e5b7ab86aac2d46e9bd412197ed09acab 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -163,13 +163,16 @@ matrix:
     - name: "buildman arm11 arm7 arm920t arm946es"
       env:
         - BUILDMAN="arm11 arm7 arm920t arm946es"
-    - name: "buildman arm926ejs (non-NXP,siemens,atmel,kirkwood,spear)"
+    - name: "buildman arm926ejs (non-NXP,siemens,at91,kirkwood,spear)"
       env:
         - JOB="arm926ejs"
-          BUILDMAN="arm926ejs -x freescale,siemens,atmel,kirkwood,spear,omap"
-    - name: "buildman atmel"
+          BUILDMAN="arm926ejs -x freescale,siemens,at91,kirkwood,spear,omap"
+    - name: "buildman at91 (non arm v7)"
       env:
-        - BUILDMAN="atmel"
+        - BUILDMAN="at91 -x armv7"
+    - name: "buildman at91 (non arm926ejs)"
+      env:
+        - BUILDMAN="at91 -x arm926ejs"
     - name: "buildman boundary engicam toradex"
       env:
         - BUILDMAN="boundary engicam toradex"
@@ -226,7 +229,7 @@ matrix:
         - BUILDMAN="sun50i"
     - name: "buildman catch-all ARM"
       env:
-        - BUILDMAN="arm -x arm11,arm7,arm9,aarch64,atmel,freescale,kirkwood,mvebu,siemens,tegra,uniphier,mx,samsung,sunxi,am33xx,omap,pxa,rockchip,toradex,socfpga,k2,xilinx"
+        - BUILDMAN="arm -x arm11,arm7,arm9,aarch64,at91,freescale,kirkwood,mvebu,siemens,tegra,uniphier,mx,samsung,sunxi,am33xx,omap,pxa,rockchip,toradex,socfpga,k2,xilinx"
     - name: "buildman sandbox x86"
       env:
         - BUILDMAN="sandbox x86"

diff --git a/Makefile b/Makefile
index c1af9307b38e2b941d651bc316dcdf82e1bff8e6..92e04dd6898783912bf8c9984246c1dbc40395b9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -291,6 +291,9 @@ DARWIN_MINOR_VERSION        = $(shell sw_vers -productVersion | cut -f 2 -d '.')
 os_x_before    = $(shell if [ $(DARWIN_MAJOR_VERSION) -le $(1) -a \
        $(DARWIN_MINOR_VERSION) -le $(2) ] ; then echo "$(3)"; else echo "$(4)"; fi ;)
 
+os_x_after = $(shell if [ $(DARWIN_MAJOR_VERSION) -ge $(1) -a \
+       $(DARWIN_MINOR_VERSION) -ge $(2) ] ; then echo "$(3)"; else echo "$(4)"; fi ;)  
+
 # Snow Leopards build environment has no longer restrictions as described above
 HOSTCC       = $(call os_x_before, 10, 5, "cc", "gcc")
 HOSTCFLAGS  += $(call os_x_before, 10, 4, "-traditional-cpp")
@@ -300,6 +303,10 @@ HOSTLDFLAGS += $(call os_x_before, 10, 5, "-multiply_defined suppress")
 # in some host tools which is a problem then ... so disable ASLR for these
 # tools
 HOSTLDFLAGS += $(call os_x_before, 10, 7, "", "-Xlinker -no_pie")
+
+# macOS Mojave (10.14.X) 
+# Undefined symbols for architecture x86_64: "_PyArg_ParseTuple"
+HOSTLDFLAGS += $(call os_x_after, 10, 14, "-lpython -dynamclib", "")
 endif
 
 # Decide whether to build built-in, modular, or both.

diff --git a/arch/arm/dts/r8a7794-alt-u-boot.dts b/arch/arm/dts/r8a7794-alt-u-boot.dts
index 593a418c3b120a004f1bc27086cd0b628f7bddb5..14cd39297e6f1e425b5821c50bfff6523c3a835d 100644 (file)
--- a/arch/arm/dts/r8a7794-alt-u-boot.dts
+++ b/arch/arm/dts/r8a7794-alt-u-boot.dts
@@ -8,6 +8,11 @@
 #include "r8a7794-alt.dts"
 #include "r8a7794-u-boot.dtsi"
 
+&i2c7 {
+       status = "okay";
+       clock-frequency = <100000>;
+};
+
 &scif2 {
        u-boot,dm-pre-reloc;
 };

diff --git a/board/renesas/alt/Kconfig b/board/renesas/alt/Kconfig
index 39d53c185b2616c865c8505a57ded448a33c7dab..957962de20e03d15360db04c633221fbf80e7891 100644 (file)
--- a/board/renesas/alt/Kconfig
+++ b/board/renesas/alt/Kconfig
@@ -9,13 +9,4 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "alt"
 
-config R8A7794_ETHERNET_B
-       bool "Use ethernet B function"
-       depends on TARGET_ALT
-       default n
-       help
-         ALT board can use default ethernet and etnernet B function.
-         This config set pin function of ethenet B. You also needt to change
-         DIP switch of board in order to use this function.
-
 endif

diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c
index b18ab7ce88723affa43b6460990f9df474f098cc..0726776a573fe6beeb979124090f37aa84ed838b 100644 (file)
--- a/board/renesas/alt/alt.c
+++ b/board/renesas/alt/alt.c
@@ -28,7 +28,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define CLK2MHZ(clk)   (clk / 1000 / 1000)
 void s_init(void)
 {
        struct rcar_rwdt *rwdt = (struct rcar_rwdt *)RWDT_BASE;
@@ -93,7 +92,7 @@ int dram_init_banksize(void)
 
 /* KSZ8041RNLI */
 #define PHY_CONTROL1           0x1E
-#define PHY_LED_MODE           0xC0000
+#define PHY_LED_MODE           0xC000
 #define PHY_LED_MODE_ACK       0x4000
 int board_phy_config(struct phy_device *phydev)
 {
@@ -108,7 +107,7 @@ int board_phy_config(struct phy_device *phydev)
 void reset_cpu(ulong addr)
 {
        struct udevice *dev;
-       const u8 pmic_bus = 1;
+       const u8 pmic_bus = 7;
        const u8 pmic_addr = 0x58;
        u8 data;
        int ret;

diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c
index 282381ede56f9538ce22dfa7c37058e1cf2eae61..7c6100873953019c0562c04e7db5f86066e75e15 100644 (file)
--- a/board/renesas/gose/gose.c
+++ b/board/renesas/gose/gose.c
@@ -98,7 +98,7 @@ int dram_init_banksize(void)
 
 /* KSZ8041RNLI */
 #define PHY_CONTROL1           0x1E
-#define PHY_LED_MODE           0xC0000
+#define PHY_LED_MODE           0xC000
 #define PHY_LED_MODE_ACK       0x4000
 int board_phy_config(struct phy_device *phydev)
 {

diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c
index 52f37c970e78568f751504d45f5abaaf4b982be9..d07a7ca2aba5af282022705deee40e7fff2fe69d 100644 (file)
--- a/board/renesas/koelsch/koelsch.c
+++ b/board/renesas/koelsch/koelsch.c
@@ -100,7 +100,7 @@ int dram_init_banksize(void)
 
 /* Koelsch has KSZ8041NL/RNL */
 #define PHY_CONTROL1           0x1E
-#define PHY_LED_MODE           0xC0000
+#define PHY_LED_MODE           0xC000
 #define PHY_LED_MODE_ACK       0x4000
 int board_phy_config(struct phy_device *phydev)
 {

diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c
index 062e88c19832359e8b8f1e82987fcef7a3d58a3e..f062bb01725ec4858dc0cf2a7950b162beaa514d 100644 (file)
--- a/board/renesas/lager/lager.c
+++ b/board/renesas/lager/lager.c
@@ -109,7 +109,7 @@ int dram_init_banksize(void)
 
 /* KSZ8041NL/RNL */
 #define PHY_CONTROL1           0x1E
-#define PHY_LED_MODE           0xC0000
+#define PHY_LED_MODE           0xC000
 #define PHY_LED_MODE_ACK       0x4000
 int board_phy_config(struct phy_device *phydev)
 {

diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c
index 663b8001ef6b2c9a8d97e5e7f6c42109baf7bbea..2e15a4cbbdc950a546742ec3bc8e37cf75abf9f8 100644 (file)
--- a/board/renesas/porter/porter.c
+++ b/board/renesas/porter/porter.c
@@ -98,7 +98,7 @@ int dram_init_banksize(void)
 
 /* porter has KSZ8041RNLI */
 #define PHY_CONTROL1           0x1E
-#define PHY_LED_MODE           0xC0000
+#define PHY_LED_MODE           0xC000
 #define PHY_LED_MODE_ACK       0x4000
 int board_phy_config(struct phy_device *phydev)
 {

diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c
index 966c0717b2495c9fa04ca3446795fdfa8727bc65..59ba262ad73ed4379b10d0d2dac4afb77c4cfe72 100644 (file)
--- a/board/renesas/silk/silk.c
+++ b/board/renesas/silk/silk.c
@@ -93,7 +93,7 @@ int dram_init_banksize(void)
 
 /* porter has KSZ8041RNLI */
 #define PHY_CONTROL1           0x1E
-#define PHY_LED_MODE           0xC0000
+#define PHY_LED_MODE           0xC000
 #define PHY_LED_MODE_ACK       0x4000
 int board_phy_config(struct phy_device *phydev)
 {

diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c
index 85e30db635f634dfe60cfb050d08689c0743f6b3..7c515950d671a96a79ffa27b56f9a1fdb6008fbf 100644 (file)
--- a/board/renesas/stout/stout.c
+++ b/board/renesas/stout/stout.c
@@ -112,7 +112,7 @@ int dram_init_banksize(void)
 
 /* Stout has KSZ8041NL/RNL */
 #define PHY_CONTROL1           0x1E
-#define PHY_LED_MODE           0xC0000
+#define PHY_LED_MODE           0xC000
 #define PHY_LED_MODE_ACK       0x4000
 int board_phy_config(struct phy_device *phydev)
 {

diff --git a/configs/alt_defconfig b/configs/alt_defconfig
index c4ece795073a352f3838de37eb2801918d6992ae..5e5467fe2f70df581fa6d6944472bed2ed4c14b1 100644 (file)
--- a/configs/alt_defconfig
+++ b/configs/alt_defconfig
@@ -57,12 +57,14 @@ CONFIG_CLK_RENESAS=y
 CONFIG_DM_GPIO=y
 CONFIG_RCAR_GPIO=y
 CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_RCAR_I2C=y
 CONFIG_SYS_I2C_RCAR_IIC=y
 CONFIG_DM_MMC=y
 CONFIG_SH_MMCIF=y
 CONFIG_RENESAS_SDHI=y
 CONFIG_MTD=y
 CONFIG_MTD_DEVICE=y
+CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_MTD=y
@@ -80,6 +82,7 @@ CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_SCIF_CONSOLE=y
 CONFIG_SPI=y
+CONFIG_DM_SPI=y
 CONFIG_SH_QSPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y

diff --git a/configs/khadas-vim2_defconfig b/configs/khadas-vim2_defconfig
index 0f738cbb908eeb681e0e21b49a5048932373555e..080dd19590e34596bcb53eec762fe9e31274df09 100644 (file)
--- a/configs/khadas-vim2_defconfig
+++ b/configs/khadas-vim2_defconfig
@@ -6,8 +6,10 @@ CONFIG_DEBUG_UART_BASE=0xc81004c0
 CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_IDENT_STRING=" khadas-vim2"
 CONFIG_DEBUG_UART=y
+CONFIG_NR_DRAM_BANKS=1
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_CONSOLE_MUX=y
+CONFIG_MISC_INIT_R=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 # CONFIG_CMD_BDI is not set
@@ -30,6 +32,7 @@ CONFIG_MTD=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_PHY=y
+CONFIG_MESON_GXL_USB_PHY=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_MESON_GXL=y
 CONFIG_DM_REGULATOR_FIXED=y

diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 825ee7c3beb315b5c3dcd52145afcc41b5f642e3..32bbf41dd1f5972e6aaa8c25d36d151e14f92f3a 100644 (file)
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -141,7 +141,7 @@ config PHY_STM32_USBPHYC
 
 config MESON_GXL_USB_PHY
        bool "Amlogic Meson GXL USB PHYs"
-       depends on PHY && ARCH_MESON && MESON_GXL
+       depends on PHY && ARCH_MESON && (MESON_GXL || MESON_GXM)
        imply REGMAP
        help
          This is the generic phy driver for the Amlogic Meson GXL

diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index 9213d33e217f44e33eea9a4e62e32a3ba377e1c6..7f72ff2e110863f3cf3d0fa637c65653c249f493 100644 (file)
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -38,7 +38,6 @@
 #define CONFIG_SYS_MONITOR_BASE                0x00000000
 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024)
 #define CONFIG_SYS_MALLOC_LEN          (1 * 1024 * 1024)
-#define CONFIG_SYS_BOOTMAPSZ           (8 * 1024 * 1024)
 
 /* ENV setting */
 #define CONFIG_ENV_ADDR        0xC0000

diff --git a/lib/bch.c b/lib/bch.c
index 20079eb9ebd12eb3d38b37f30d515b131f55a383..c4fac77d611456b116b663b0553d4325c6861fda 100644 (file)
--- a/lib/bch.c
+++ b/lib/bch.c
@@ -62,6 +62,9 @@
 #include <errno.h>
 #if defined(__FreeBSD__)
 #include <sys/endian.h>
+#elif defined(__APPLE__)
+#include <machine/endian.h>
+#include <libkern/OSByteOrder.h>
 #else
 #include <endian.h>
 #endif
@@ -70,7 +73,11 @@
 #include <string.h>
 
 #undef cpu_to_be32
+#if defined(__APPLE__)
+#define cpu_to_be32 OSSwapHostToBigInt32
+#else
 #define cpu_to_be32 htobe32
+#endif
 #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
 #define kmalloc(size, flags)   malloc(size)
 #define kzalloc(size, flags)   calloc(1, size)
@@ -116,7 +123,7 @@ struct gf_poly_deg1 {
 };
 
 #ifdef USE_HOSTCC
-#if !defined(__DragonFly__) && !defined(__FreeBSD__)
+#if !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__APPLE__)
 static int fls(int x)
 {
        int r = 32;

diff --git a/tools/Makefile b/tools/Makefile
index 081383d7a790fde91699b532d962cc6ee9849f8f..d377d85f74e7ae08a992df3ef5a05acb44e0b2a1 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -254,7 +254,8 @@ HOST_EXTRACFLAGS += -include $(srctree)/include/compiler.h \
                -I$(srctree)/tools \
                -DUSE_HOSTCC \
                -D__KERNEL_STRICT_NAMES \
-               -D_GNU_SOURCE
+               -D_GNU_SOURCE \
+               -std=gnu99
 
 __build:       $(LOGO-y)