[U-Boot] [PATCH v2 0/9] Various microblaze cleanups
Hi,
This patch series depends on all previous series. All these patches will be available in git://git.denx.de/u-boot-microblaze.git also with patches which I am going to send now.
Thanks, Michal
Changes in v2: - Remove also from xparameters.h - new patch in this series - new patch in this series - new patch in this series
Michal Simek (9): microblaze: Enable axi emac via Kconfig microblaze: Move eth configuration to Kconfig microblaze: Remove systemace from board file microblaze: Remove CONFIG_FIT from board file microblaze: Move CONFIG_NETCONSOLE to Kconfig microblaze: Remove empty file - cpu.c microblaze: Read information about RAM from DT microblaze: Enable HUSH via Kconfig microblaze: Fix board_init calling sequence
arch/microblaze/cpu/Makefile | 2 +- arch/microblaze/cpu/cpu.c | 9 ---- .../xilinx/microblaze-generic/microblaze-generic.c | 15 ++----- board/xilinx/microblaze-generic/xparameters.h | 9 ---- configs/microblaze-generic_defconfig | 8 ++++ include/configs/microblaze-generic.h | 48 +--------------------- 6 files changed, 15 insertions(+), 76 deletions(-) delete mode 100644 arch/microblaze/cpu/cpu.c
Enable driver by default for all platforms.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
Changes in v2: None
configs/microblaze-generic_defconfig | 1 + include/configs/microblaze-generic.h | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 1a389615729f..438c2f15d507 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -10,6 +10,7 @@ CONFIG_CMD_GPIO=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_DM_ETH=y +CONFIG_XILINX_AXIEMAC=y CONFIG_XILINX_EMACLITE=y CONFIG_SYS_NS16550=y CONFIG_XILINX_UARTLITE=y diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 4d8bf46e69f2..8b6ddcbc6ab6 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -42,11 +42,7 @@
/* ethernet */ #undef CONFIG_SYS_ENET -#if defined(CONFIG_XILINX_EMACLITE) -# define CONFIG_SYS_ENET -#endif -#if defined(XILINX_AXIEMAC_BASEADDR) -# define CONFIG_XILINX_AXIEMAC 1 +#if defined(CONFIG_XILINX_EMACLITE) || defined(CONFIG_XILINX_AXIEMAC) # define CONFIG_SYS_ENET #endif
Cleanup board specific file.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
Changes in v2: None
configs/microblaze-generic_defconfig | 3 +++ include/configs/microblaze-generic.h | 14 -------------- 2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 438c2f15d507..b5aabe8ba4e6 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -7,6 +7,9 @@ CONFIG_SPL=y CONFIG_SYS_PROMPT="U-Boot-mONStR> " CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_DM_ETH=y diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 8b6ddcbc6ab6..ed7e9941a668 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -40,14 +40,6 @@ /* setting reset address */ /*#define CONFIG_SYS_RESET_ADDRESS CONFIG_SYS_TEXT_BASE*/
-/* ethernet */ -#undef CONFIG_SYS_ENET -#if defined(CONFIG_XILINX_EMACLITE) || defined(CONFIG_XILINX_AXIEMAC) -# define CONFIG_SYS_ENET -#endif - -#undef ET_DEBUG - /* gpio */ #ifdef XILINX_GPIO_BASEADDR # define CONFIG_XILINX_GPIO @@ -218,12 +210,6 @@ # undef CONFIG_CMD_CACHE #endif
-#ifdef CONFIG_SYS_ENET -# define CONFIG_CMD_PING -# define CONFIG_CMD_DHCP -# define CONFIG_CMD_TFTPPUT -#endif - #if defined(CONFIG_SYSTEMACE) # define CONFIG_CMD_EXT2 # define CONFIG_CMD_FAT
Systemace is ancient IP which is not tested. Remove it from default configuration.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
Changes in v2: - Remove also from xparameters.h
board/xilinx/microblaze-generic/xparameters.h | 5 ----- include/configs/microblaze-generic.h | 15 --------------- 2 files changed, 20 deletions(-)
diff --git a/board/xilinx/microblaze-generic/xparameters.h b/board/xilinx/microblaze-generic/xparameters.h index 4f44427e601c..552aaf4fdea0 100644 --- a/board/xilinx/microblaze-generic/xparameters.h +++ b/board/xilinx/microblaze-generic/xparameters.h @@ -39,11 +39,6 @@ #define XILINX_RAM_START 0x28000000 #define XILINX_RAM_SIZE 0x04000000
-/* Sysace Controller is SysACE_CompactFlash */ -#define XILINX_SYSACE_BASEADDR 0x41800000 -#define XILINX_SYSACE_HIGHADDR 0x4180ffff -#define XILINX_SYSACE_MEM_WIDTH 16 - /* Watchdog IP is wxi_timebase_wdt_0 */ #define XILINX_WATCHDOG_BASEADDR 0x50000000 #define XILINX_WATCHDOG_IRQ 1 diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index ed7e9941a668..e88f5f852610 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -163,16 +163,6 @@ #endif /* !SPIFLASH */ #endif /* !FLASH */
-/* system ace */ -#ifdef XILINX_SYSACE_BASEADDR -# define CONFIG_SYSTEMACE -/* #define DEBUG_SYSTEMACE */ -# define SYSTEMACE_CONFIG_FPGA -# define CONFIG_SYS_SYSTEMACE_BASE XILINX_SYSACE_BASEADDR -# define CONFIG_SYS_SYSTEMACE_WIDTH XILINX_SYSACE_MEM_WIDTH -# define CONFIG_DOS_PARTITION -#endif - #if defined(XILINX_USE_ICACHE) # define CONFIG_ICACHE #else @@ -210,11 +200,6 @@ # undef CONFIG_CMD_CACHE #endif
-#if defined(CONFIG_SYSTEMACE) -# define CONFIG_CMD_EXT2 -# define CONFIG_CMD_FAT -#endif - #if defined(FLASH) # define CONFIG_CMD_JFFS2 # define CONFIG_CMD_UBI
And enable it via defconfig by default.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
Changes in v2: None
configs/microblaze-generic_defconfig | 2 ++ include/configs/microblaze-generic.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index b5aabe8ba4e6..29acb063ee8b 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -4,6 +4,8 @@ CONFIG_SPL_DM=y CONFIG_TARGET_MICROBLAZE_GENERIC=y CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic" CONFIG_SPL=y +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y CONFIG_SYS_PROMPT="U-Boot-mONStR> " CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index e88f5f852610..8c36732a85a5 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -294,7 +294,6 @@
/* Enable flat device tree support */ #define CONFIG_LMB 1 -#define CONFIG_FIT 1 #define CONFIG_OF_LIBFDT 1
#if defined(CONFIG_XILINX_AXIEMAC)
Cleanup board file.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
Changes in v2: None
configs/microblaze-generic_defconfig | 1 + include/configs/microblaze-generic.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 29acb063ee8b..e0551f815334 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_EMBED=y +CONFIG_NETCONSOLE=y CONFIG_DM_ETH=y CONFIG_XILINX_AXIEMAC=y CONFIG_XILINX_EMACLITE=y diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 8c36732a85a5..48edddae4d56 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -286,7 +286,6 @@
#define CONFIG_CMDLINE_EDITING
-#define CONFIG_NETCONSOLE #define CONFIG_SYS_CONSOLE_IS_IN_ENV
/* Use the HUSH parser */
No need to have empty unused file in architecture code.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
Changes in v2: None
arch/microblaze/cpu/Makefile | 2 +- arch/microblaze/cpu/cpu.c | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 arch/microblaze/cpu/cpu.c
diff --git a/arch/microblaze/cpu/Makefile b/arch/microblaze/cpu/Makefile index 4955e812360b..069721033f08 100644 --- a/arch/microblaze/cpu/Makefile +++ b/arch/microblaze/cpu/Makefile @@ -7,5 +7,5 @@
extra-y = start.o obj-y = irq.o -obj-y += cpu.o interrupts.o cache.o exception.o timer.o +obj-y += interrupts.o cache.o exception.o timer.o obj-$(CONFIG_SPL_BUILD) += spl.o diff --git a/arch/microblaze/cpu/cpu.c b/arch/microblaze/cpu/cpu.c deleted file mode 100644 index 8e459d807f92..000000000000 --- a/arch/microblaze/cpu/cpu.c +++ /dev/null @@ -1,9 +0,0 @@ -/* - * (C) Copyright 2004 Atmark Techno, Inc. - * - * Yasushi SHOJI yashi@atmark-techno.com - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* EMPTY FILE */
Do not setup ram start/size in board file. Read it from DT instead.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
Changes in v2: - new patch in this series
board/xilinx/microblaze-generic/microblaze-generic.c | 9 --------- board/xilinx/microblaze-generic/xparameters.h | 4 ---- include/configs/microblaze-generic.h | 9 +-------- 3 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c index 0e7509d288ce..0d7bed58d808 100644 --- a/board/xilinx/microblaze-generic/microblaze-generic.c +++ b/board/xilinx/microblaze-generic/microblaze-generic.c @@ -23,7 +23,6 @@ DECLARE_GLOBAL_DATA_PTR; static int reset_pin = -1; #endif
-#if CONFIG_IS_ENABLED(OF_CONTROL) ulong ram_base;
void dram_init_banksize(void) @@ -57,14 +56,6 @@ int dram_init(void)
return 0; }; -#else -int dram_init(void) -{ - gd->ram_size = CONFIG_SYS_SDRAM_SIZE; - - return 0; -} -#endif
int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { diff --git a/board/xilinx/microblaze-generic/xparameters.h b/board/xilinx/microblaze-generic/xparameters.h index 552aaf4fdea0..ccb528ed9266 100644 --- a/board/xilinx/microblaze-generic/xparameters.h +++ b/board/xilinx/microblaze-generic/xparameters.h @@ -35,10 +35,6 @@ #define XILINX_FLASH_START 0x2c000000 #define XILINX_FLASH_SIZE 0x00800000
-/* Main Memory is DDR_SDRAM_64Mx32 */ -#define XILINX_RAM_START 0x28000000 -#define XILINX_RAM_SIZE 0x04000000 - /* Watchdog IP is wxi_timebase_wdt_0 */ #define XILINX_WATCHDOG_BASEADDR 0x50000000 #define XILINX_WATCHDOG_IRQ 1 diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 48edddae4d56..3458e66a8873 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -68,13 +68,6 @@ # endif #endif
-#if !defined(CONFIG_OF_CONTROL) || \ - (defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_OF_CONTROL)) -/* ddr sdram - main memory */ -# define CONFIG_SYS_SDRAM_BASE XILINX_RAM_START -# define CONFIG_SYS_SDRAM_SIZE XILINX_RAM_SIZE -#endif - #define CONFIG_SYS_MALLOC_LEN 0xC0000
/* Stack location before relocation */ @@ -259,7 +252,7 @@ #define CONFIG_SYS_MAXARGS 15 #define CONFIG_SYS_LONGHELP /* default load address */ -#define CONFIG_SYS_LOAD_ADDR XILINX_RAM_START +#define CONFIG_SYS_LOAD_ADDR 0
#define CONFIG_BOOTDELAY -1 /* -1 disables auto-boot */ #define CONFIG_BOOTARGS "root=romfs"
Cleanup board file.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
Changes in v2: - new patch in this series
configs/microblaze-generic_defconfig | 1 + include/configs/microblaze-generic.h | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index e0551f815334..21a7261257eb 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic" CONFIG_SPL=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y +CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot-mONStR> " CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 3458e66a8873..9b90aa7dc0ae 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -281,9 +281,6 @@
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* Enable flat device tree support */ #define CONFIG_LMB 1 #define CONFIG_OF_LIBFDT 1
board_init() is in final elf file but it is not called at all. Use board_init_late() instead and call gpio_init() from it.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
Changes in v2: - new patch in this series
board/xilinx/microblaze-generic/microblaze-generic.c | 6 ++++-- include/configs/microblaze-generic.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c index 0d7bed58d808..ccd4ec955b5b 100644 --- a/board/xilinx/microblaze-generic/microblaze-generic.c +++ b/board/xilinx/microblaze-generic/microblaze-generic.c @@ -76,7 +76,7 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; }
-int gpio_init (void) +static int gpio_init(void) { #ifdef CONFIG_XILINX_GPIO reset_pin = gpio_alloc(CONFIG_SYS_GPIO_0_ADDR, "reset", 1); @@ -86,7 +86,9 @@ int gpio_init (void) return 0; }
-void board_init(void) +int board_late_init(void) { gpio_init(); + + return 0; } diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 9b90aa7dc0ae..394568dba6c8 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -45,6 +45,7 @@ # define CONFIG_XILINX_GPIO # define CONFIG_SYS_GPIO_0_ADDR XILINX_GPIO_BASEADDR #endif +#define CONFIG_BOARD_LATE_INIT
/* interrupt controller */ #ifdef XILINX_INTC_BASEADDR
participants (1)
-
Michal Simek