Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Conflicts: spl/Makefile
Showing
- arch/arm/cpu/armv7/exynos/Makefile 1 addition, 1 deletionarch/arm/cpu/armv7/exynos/Makefile
- arch/arm/cpu/armv7/exynos/clock.c 4 additions, 6 deletionsarch/arm/cpu/armv7/exynos/clock.c
- arch/arm/cpu/armv7/exynos/tzpc.c 17 additions, 8 deletionsarch/arm/cpu/armv7/exynos/tzpc.c
- arch/arm/cpu/armv7/s5p-common/Makefile 2 additions, 0 deletionsarch/arm/cpu/armv7/s5p-common/Makefile
- arch/arm/dts/exynos5250.dtsi 33 additions, 0 deletionsarch/arm/dts/exynos5250.dtsi
- arch/arm/include/asm/arch-exynos/cpu.h 4 additions, 0 deletionsarch/arm/include/asm/arch-exynos/cpu.h
- arch/arm/include/asm/arch-exynos/dwmmc.h 4 additions, 7 deletionsarch/arm/include/asm/arch-exynos/dwmmc.h
- arch/arm/include/asm/arch-exynos/tmu.h 25 additions, 33 deletionsarch/arm/include/asm/arch-exynos/tmu.h
- arch/arm/include/asm/arch-exynos/tzpc.h 20 additions, 0 deletionsarch/arm/include/asm/arch-exynos/tzpc.h
- board/samsung/dts/exynos5250-smdk5250.dts 24 additions, 0 deletionsboard/samsung/dts/exynos5250-smdk5250.dts
- board/samsung/origen/lowlevel_init.S 2 additions, 42 deletionsboard/samsung/origen/lowlevel_init.S
- board/samsung/origen/origen_setup.h 0 additions, 25 deletionsboard/samsung/origen/origen_setup.h
- board/samsung/smdk5250/Makefile 4 additions, 1 deletionboard/samsung/smdk5250/Makefile
- board/samsung/smdk5250/clock_init.c 18 additions, 0 deletionsboard/samsung/smdk5250/clock_init.c
- board/samsung/smdk5250/clock_init.h 5 additions, 0 deletionsboard/samsung/smdk5250/clock_init.h
- board/samsung/smdk5250/exynos5-dt.c 423 additions, 0 deletionsboard/samsung/smdk5250/exynos5-dt.c
- board/samsung/smdk5250/lowlevel_init.S 2 additions, 0 deletionsboard/samsung/smdk5250/lowlevel_init.S
- board/samsung/smdk5250/setup.h 0 additions, 25 deletionsboard/samsung/smdk5250/setup.h
- board/samsung/smdk5250/smdk5250.c 56 additions, 167 deletionsboard/samsung/smdk5250/smdk5250.c
- board/samsung/smdk5250/spl_boot.c 51 additions, 13 deletionsboard/samsung/smdk5250/spl_boot.c
Loading
Please register or sign in to comment