[U-Boot] please pull u-boot-samsung master

Dear Albert,
The following changes since commit d44a5f51288aec60c6bdb4ac939d75c24e5bf9c2:
Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master' (2013-11-22 10:19:35 +0100)
are available in the git repository at:
git://git.denx.de/u-boot-samsung master
for you to fetch changes up to 01322004ec08c207141b08a2e0423b9b4c7b2714:
arm: exynos: remove the unused define. (2013-12-05 10:42:04 +0900)
---------------------------------------------------------------- Jaehoon Chung (3): arm: exynos: fix set_mmc_clk for exynos4x12 arm: exynos/goni: fix the return type for s5p_mmc_init arm: exynos: remove the unused define.
Luka Perkov (1): config: arm: exynos5250: remove duplicate defines
Minkyu Kang (1): arm: exynos: fix the align for exynos4_power structure
Piotr Wilczek (7): driver:usb:s3c_udc: add support for Exynos4x12 trats2: enable ums support on Trats2 trats2: enable dfu and thor protocol for Tizen download board: trats2: remove unused defines from config file board: trats2: fix environmental variables board: trats2: fix access to samsung registers board: trats2: update Tizen partition definitions
Przemyslaw Marczak (1): trats: usb: Add usb_cable_connected() function
Rajeshwari Shinde (1): exynos: spl: Add a custom spi copy function
arch/arm/cpu/armv7/exynos/clock.c | 3 +- arch/arm/cpu/armv7/exynos/pinmux.c | 2 +- arch/arm/cpu/armv7/exynos/spl_boot.c | 122 +++++++++++++++++++++++++++++- arch/arm/include/asm/arch-exynos/dwmmc.h | 4 - arch/arm/include/asm/arch-exynos/mmc.h | 2 +- arch/arm/include/asm/arch-exynos/power.h | 2 +- arch/arm/include/asm/arch-exynos/spi.h | 1 + arch/arm/include/asm/arch-s5pc1xx/mmc.h | 2 +- board/samsung/trats/trats.c | 11 +++ board/samsung/trats2/trats2.c | 108 ++++++++++++++++++++++++-- drivers/usb/gadget/regs-otg.h | 5 ++ drivers/usb/gadget/s3c_udc_otg.c | 9 ++- include/configs/exynos5250-dt.h | 25 +----- include/configs/trats.h | 1 + include/configs/trats2.h | 68 ++++++++++++----- 15 files changed, 300 insertions(+), 65 deletions(-)

Hi Minkyu,
On Thu, 05 Dec 2013 17:11:17 +0900, Minkyu Kang mk7.kang@samsung.com wrote:
Dear Albert,
The following changes since commit d44a5f51288aec60c6bdb4ac939d75c24e5bf9c2:
Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master' (2013-11-22 10:19:35 +0100)
are available in the git repository at:
git://git.denx.de/u-boot-samsung master
for you to fetch changes up to 01322004ec08c207141b08a2e0423b9b4c7b2714:
arm: exynos: remove the unused define. (2013-12-05 10:42:04 +0900)
This breaks three boards in ARM: smdkv310 origen arndale
spl_boot.c: In function 'exynos_spi_copy': spl_boot.c:111:49: error: 'CONFIG_ENV_SPI_BASE' undeclared (first use in this function) spl_boot.c:111:49: note: each undeclared identifier is reported only once for each function it appears in spl_boot.c:142:2: error: 'SPI_FLASH_UBOOT_POS' undeclared (first use in this function) spl_boot.c: In function 'copy_uboot_to_ram': spl_boot.c:189:28: warning: unused variable 'param' [-Wunused-variable] spl_boot.c: At top level: spl_boot.c:107:13: warning: 'exynos_spi_copy' defined but not used [-Wunused-function]
This is due to commit 347e45d, aka:
Rajeshwari Shinde (1): exynos: spl: Add a custom spi copy function
Amicalement,

The following changes since commit d44a5f51288aec60c6bdb4ac939d75c24e5bf9c2:
Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master' (2013-11-22 10:19:35 +0100)
are available in the git repository at:
git://git.denx.de/u-boot-samsung master
for you to fetch changes up to 55f2118c11ff933e272c1084f93e72ff719a269b:
arm: arndale: disable spi boot (2013-12-06 19:18:13 +0900)
---------------------------------------------------------------- Jaehoon Chung (3): arm: exynos: fix set_mmc_clk for exynos4x12 arm: exynos/goni: fix the return type for s5p_mmc_init arm: exynos: remove the unused define.
Luka Perkov (1): config: arm: exynos5250: remove duplicate defines
Minkyu Kang (3): arm: exynos: fix the align for exynos4_power structure arm: exynos: adds ifdef for spi boot arm: arndale: disable spi boot
Piotr Wilczek (7): driver:usb:s3c_udc: add support for Exynos4x12 trats2: enable ums support on Trats2 trats2: enable dfu and thor protocol for Tizen download board: trats2: remove unused defines from config file board: trats2: fix environmental variables board: trats2: fix access to samsung registers board: trats2: update Tizen partition definitions
Przemyslaw Marczak (1): trats: usb: Add usb_cable_connected() function
Rajeshwari Shinde (1): exynos: spl: Add a custom spi copy function
arch/arm/cpu/armv7/exynos/clock.c | 3 +- arch/arm/cpu/armv7/exynos/pinmux.c | 2 +- arch/arm/cpu/armv7/exynos/spl_boot.c | 126 +++++++++++++++++++++++++++++- arch/arm/include/asm/arch-exynos/dwmmc.h | 4 - arch/arm/include/asm/arch-exynos/mmc.h | 2 +- arch/arm/include/asm/arch-exynos/power.h | 2 +- arch/arm/include/asm/arch-exynos/spi.h | 1 + arch/arm/include/asm/arch-s5pc1xx/mmc.h | 2 +- board/samsung/trats/trats.c | 11 +++ board/samsung/trats2/trats2.c | 108 +++++++++++++++++++++++-- drivers/usb/gadget/regs-otg.h | 5 ++ drivers/usb/gadget/s3c_udc_otg.c | 9 ++- include/configs/arndale.h | 4 - include/configs/exynos5250-dt.h | 25 +----- include/configs/trats.h | 1 + include/configs/trats2.h | 68 +++++++++++----- 16 files changed, 304 insertions(+), 69 deletions(-)

Hi Minkyu,
On Fri, 06 Dec 2013 19:51:21 +0900, Minkyu Kang mk7.kang@samsung.com wrote:
The following changes since commit d44a5f51288aec60c6bdb4ac939d75c24e5bf9c2:
Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master' (2013-11-22 10:19:35 +0100)
are available in the git repository at:
git://git.denx.de/u-boot-samsung master
for you to fetch changes up to 55f2118c11ff933e272c1084f93e72ff719a269b:
arm: arndale: disable spi boot (2013-12-06 19:18:13 +0900)
Jaehoon Chung (3): arm: exynos: fix set_mmc_clk for exynos4x12 arm: exynos/goni: fix the return type for s5p_mmc_init arm: exynos: remove the unused define.
Luka Perkov (1): config: arm: exynos5250: remove duplicate defines
Minkyu Kang (3): arm: exynos: fix the align for exynos4_power structure arm: exynos: adds ifdef for spi boot arm: arndale: disable spi boot
Piotr Wilczek (7): driver:usb:s3c_udc: add support for Exynos4x12 trats2: enable ums support on Trats2 trats2: enable dfu and thor protocol for Tizen download board: trats2: remove unused defines from config file board: trats2: fix environmental variables board: trats2: fix access to samsung registers board: trats2: update Tizen partition definitions
Przemyslaw Marczak (1): trats: usb: Add usb_cable_connected() function
Rajeshwari Shinde (1): exynos: spl: Add a custom spi copy function
arch/arm/cpu/armv7/exynos/clock.c | 3 +- arch/arm/cpu/armv7/exynos/pinmux.c | 2 +- arch/arm/cpu/armv7/exynos/spl_boot.c | 126 +++++++++++++++++++++++++++++- arch/arm/include/asm/arch-exynos/dwmmc.h | 4 - arch/arm/include/asm/arch-exynos/mmc.h | 2 +- arch/arm/include/asm/arch-exynos/power.h | 2 +- arch/arm/include/asm/arch-exynos/spi.h | 1 + arch/arm/include/asm/arch-s5pc1xx/mmc.h | 2 +- board/samsung/trats/trats.c | 11 +++ board/samsung/trats2/trats2.c | 108 +++++++++++++++++++++++-- drivers/usb/gadget/regs-otg.h | 5 ++ drivers/usb/gadget/s3c_udc_otg.c | 9 ++- include/configs/arndale.h | 4 - include/configs/exynos5250-dt.h | 25 +----- include/configs/trats.h | 1 + include/configs/trats2.h | 68 +++++++++++----- 16 files changed, 304 insertions(+), 69 deletions(-)
Applied to u-boot-arm/master, thanks!
Amicalement,
participants (2)
-
Albert ARIBAUD
-
Minkyu Kang