leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge http://git.denx.de/u-boot-samsung

Browse Source 
Signed-off-by: Tom Rini <trini@konsulko.com>

Conflicts:
	configs/peach-pi_defconfig
	configs/peach-pit_defconfig
This commit is contained in:
Tom Rini
2016-06-06 13:24:23 -04:00
parent 65eac4cc54 086e13c5f6
commit d77fa2ff76
101 changed files with 3140 additions and 1485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/cpu/armv7/s5p-common/timer.c
View File

@@ -12,6 +12,9 @@
#include <asm/io.h>
#include <asm/arch/pwm.h>
#include <asm/arch/clk.h>
/* Use the old PWM interface for now */
#undef CONFIG_DM_PWM
#include <pwm.h>
DECLARE_GLOBAL_DATA_PTR;