diff options
| author | Tom Rini <trini@konsulko.com> | 2017-09-05 02:17:59 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-05 02:17:59 (GMT) |
| commit | a0e80c97c9ba1409c2370f6c8b2a4d6a48cdb15c (patch) | |
| tree | e290db369f81451743eb363499e2bc45f0f96288 /board | |
| parent | ced0fd938d37605a22b2c24a351dc454e411cfbc (diff) | |
| parent | 0d0915bef756cb708c84462b8b2ade2606370167 (diff) | |
| download | u-boot-a0e80c97c9ba1409c2370f6c8b2a4d6a48cdb15c.tar.xz | |
Merge branch 'rmobile' of git://git.denx.de/u-boot-sh
Diffstat (limited to 'board')
| -rw-r--r-- | board/renesas/salvator-x/salvator-x.c | 11 | ||||
| -rw-r--r-- | board/renesas/ulcb/ulcb.c | 11 |
2 files changed, 6 insertions, 16 deletions
diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c index a09cd56..2695de5 100644 --- a/board/renesas/salvator-x/salvator-x.c +++ b/board/renesas/salvator-x/salvator-x.c @@ -116,7 +116,7 @@ int board_init(void) /* USB1 pull-up */ setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN); -#ifdef CONFIG_RAVB +#ifdef CONFIG_RENESAS_RAVB /* EtherAVB Enable */ /* GPSR2 */ gpio_request(GPIO_GFN_AVB_AVTP_CAPTURE_A, NULL); @@ -158,12 +158,7 @@ int board_init(void) udelay(1); #endif - return 0; -} - -#ifdef CONFIG_SH_SDHI -int board_mmc_init(bd_t *bis) -{ +#ifdef CONFIG_MMC /* SDHI0 */ gpio_request(GPIO_GFN_SD0_DAT0, NULL); gpio_request(GPIO_GFN_SD0_DAT1, NULL); @@ -227,10 +222,10 @@ int board_mmc_init(bd_t *bis) gpio_request(GPIO_GP_3_14, NULL); gpio_direction_output(GPIO_GP_3_15, 1); /* power on */ gpio_direction_output(GPIO_GP_3_14, 1); /* 1: 3.3V, 0: 1.8V */ +#endif return 0; } -#endif int dram_init(void) { diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c index 068cbde..2b6cc61 100644 --- a/board/renesas/ulcb/ulcb.c +++ b/board/renesas/ulcb/ulcb.c @@ -105,7 +105,7 @@ int board_init(void) /* USB1 pull-up */ setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN); -#ifdef CONFIG_RAVB +#ifdef CONFIG_RENESAS_RAVB /* EtherAVB Enable */ /* GPSR2 */ gpio_request(GPIO_GFN_AVB_AVTP_CAPTURE_A, NULL); @@ -137,12 +137,7 @@ int board_init(void) udelay(1); #endif - return 0; -} - -#ifdef CONFIG_SH_SDHI -int board_mmc_init(bd_t *bis) -{ +#ifdef CONFIG_MMC /* SDHI0 */ gpio_request(GPIO_GFN_SD0_DAT0, NULL); gpio_request(GPIO_GFN_SD0_DAT1, NULL); @@ -179,10 +174,10 @@ int board_mmc_init(bd_t *bis) gpio_request(GPIO_GP_5_9, NULL); gpio_direction_output(GPIO_GP_5_3, 0); /* 1: 3.3V, 0: 1.8V */ gpio_direction_output(GPIO_GP_5_9, 0); /* 1: 3.3V, 0: 1.8V */ +#endif return 0; } -#endif int dram_init(void) { |