projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into next
[platform/kernel/u-boot.git]
/
include
/
configs
/
rcar-gen2-common.h
diff --git
a/include/configs/rcar-gen2-common.h
b/include/configs/rcar-gen2-common.h
index
a86180e
..
291c2a4
100644
(file)
--- a/
include/configs/rcar-gen2-common.h
+++ b/
include/configs/rcar-gen2-common.h
@@
-10,10
+10,6
@@
#include <asm/arch/rmobile.h>
#include <asm/arch/rmobile.h>
-#ifndef CONFIG_PINCTRL_PFC
-#define CONFIG_SH_GPIO_PFC
-#endif
-
/* console */
#define CFG_SYS_BAUDRATE_TABLE { 38400, 115200 }
/* console */
#define CFG_SYS_BAUDRATE_TABLE { 38400, 115200 }
@@
-21,7
+17,6
@@
#define CFG_SYS_SDRAM_SIZE (RCAR_GEN2_UBOOT_SDRAM_SIZE)
/* Timer */
#define CFG_SYS_SDRAM_SIZE (RCAR_GEN2_UBOOT_SDRAM_SIZE)
/* Timer */
-#define CONFIG_TMU_TIMER
#define CFG_SYS_TIMER_COUNTER (TMU_BASE + 0xc) /* TCNT0 */
#define CFG_SYS_TIMER_RATE (get_board_sys_clk() / 8)
#define CFG_SYS_TIMER_COUNTER (TMU_BASE + 0xc) /* TCNT0 */
#define CFG_SYS_TIMER_RATE (get_board_sys_clk() / 8)