Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Conflicts: tools/Makefile
No related branches found
No related tags found
Showing
- MAINTAINERS 4 additions, 0 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arm/include/asm/arch-exynos/gpio.h 13 additions, 4 deletionsarch/arm/include/asm/arch-exynos/gpio.h
- arch/arm/include/asm/arch-exynos/mmc.h 5 additions, 1 deletionarch/arm/include/asm/arch-exynos/mmc.h
- arch/arm/include/asm/arch-s5pc1xx/mmc.h 5 additions, 1 deletionarch/arm/include/asm/arch-s5pc1xx/mmc.h
- board/samsung/arndale/Makefile 34 additions, 0 deletionsboard/samsung/arndale/Makefile
- board/samsung/arndale/arndale.c 101 additions, 0 deletionsboard/samsung/arndale/arndale.c
- board/samsung/arndale/arndale_spl.c 50 additions, 0 deletionsboard/samsung/arndale/arndale_spl.c
- board/samsung/dts/exynos5250-arndale.dts 39 additions, 0 deletionsboard/samsung/dts/exynos5250-arndale.dts
- board/samsung/goni/config.mk 0 additions, 18 deletionsboard/samsung/goni/config.mk
- board/samsung/goni/goni.c 31 additions, 2 deletionsboard/samsung/goni/goni.c
- board/samsung/smdkc100/config.mk 0 additions, 16 deletionsboard/samsung/smdkc100/config.mk
- boards.cfg 1 addition, 0 deletionsboards.cfg
- drivers/power/pmic/pmic_max77686.c 192 additions, 0 deletionsdrivers/power/pmic/pmic_max77686.c
- include/configs/arndale.h 255 additions, 0 deletionsinclude/configs/arndale.h
- include/configs/exynos5250-dt.h 1 addition, 1 deletioninclude/configs/exynos5250-dt.h
- include/configs/s5p_goni.h 3 additions, 0 deletionsinclude/configs/s5p_goni.h
- include/configs/smdkc100.h 3 additions, 0 deletionsinclude/configs/smdkc100.h
- include/power/max77686_pmic.h 26 additions, 0 deletionsinclude/power/max77686_pmic.h
- tools/Makefile 2 additions, 1 deletiontools/Makefile
Loading
Please register or sign in to comment