| 修訂 | 622b2ad9e548727f6aa0bfb36c8348e252980af3 (tree) |
|---|---|
| 時間 | 2020-07-26 17:47:27 |
| 作者 | Yoshinori Sato <ysato@user...> |
| Commiter | Yoshinori Sato |
rx600 update
arch/rx/cpu/rx600/config.mk (diff)
arch/rx/cpu/rx600/cpu.c (diff)
arch/rx/include/asm/global_data.h (diff) drivers/net/Kconfig (diff)| @@ -21,4 +21,4 @@ | ||
| 21 | 21 | # |
| 22 | 22 | # |
| 23 | 23 | USE_PRIVATE_LIBGCC = $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) |
| 24 | -PLATFORM_RELFLAGS += -ffixed-r15 | |
| 24 | +PLATFORM_RELFLAGS += -ffixed-r12 |
| @@ -22,8 +22,11 @@ | ||
| 22 | 22 | |
| 23 | 23 | #include <common.h> |
| 24 | 24 | #include <command.h> |
| 25 | +#include <irq_func.h> | |
| 26 | +#include <cpu_func.h> | |
| 25 | 27 | #include <asm/processor.h> |
| 26 | 28 | #include <asm/io.h> |
| 29 | +#include <netdev.h> | |
| 27 | 30 | |
| 28 | 31 | DECLARE_GLOBAL_DATA_PTR; |
| 29 | 32 |
| @@ -47,7 +50,7 @@ int cleanup_before_linux(void) | ||
| 47 | 50 | return 0; |
| 48 | 51 | } |
| 49 | 52 | |
| 50 | -int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) | |
| 53 | +int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) | |
| 51 | 54 | { |
| 52 | 55 | disable_interrupts(); |
| 53 | 56 | reset_cpu(0); |
| @@ -84,3 +87,17 @@ int dcache_status(void) | ||
| 84 | 87 | { |
| 85 | 88 | return 0; |
| 86 | 89 | } |
| 90 | + | |
| 91 | +int cpu_eth_init(bd_t *bis) | |
| 92 | +{ | |
| 93 | +#if defined(CONFIG_SH_ETHER) | |
| 94 | +#if CONFIG_SH_ETHER_PHY_MODE == PHY_INTERFACE_MODE_RMII | |
| 95 | + outb(0x82, 0x8c10e); | |
| 96 | + outb(inb(0x8c065) | 0x10, 0x8c065); | |
| 97 | + outb(inb(0x8c067) | 0xf2, 0x8c067); | |
| 98 | + outb(inb(0x8c068) | 0x08, 0x8c068); | |
| 99 | +#endif | |
| 100 | + sh_eth_initialize(bis); | |
| 101 | +#endif | |
| 102 | + return 0; | |
| 103 | +} |
| @@ -33,6 +33,6 @@ struct arch_global_data { | ||
| 33 | 33 | |
| 34 | 34 | #include <asm-generic/global_data.h> |
| 35 | 35 | |
| 36 | -#define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm("r15") | |
| 36 | +#define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm("r12") | |
| 37 | 37 | |
| 38 | 38 | #endif /* __ASM_RX_GLOBALDATA_H_ */ |
| @@ -509,13 +509,6 @@ config GMAC_ROCKCHIP | ||
| 509 | 509 | This driver provides Rockchip SoCs network support based on the |
| 510 | 510 | Synopsys Designware driver. |
| 511 | 511 | |
| 512 | -config SH_ETHER | |
| 513 | - bool "Reneesas On-chip ethernet controller" | |
| 514 | - select PHYLIB | |
| 515 | - select MII | |
| 516 | - help | |
| 517 | - This driver supports Renesas On-chip ethernet controller | |
| 518 | - | |
| 519 | 512 | config RENESAS_RAVB |
| 520 | 513 | bool "Renesas Ethernet AVB MAC" |
| 521 | 514 | depends on DM_ETH && RCAR_GEN3 |
Fork