Various microblaze cleanups
Subsystems (2)
v2 cover Various microblaze cleanups
Hi,
This patch series depends on all previous series.
All these patches will be available ingit://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
Signature · 1 line
1.9.1
PATCH v2 1/9 microblaze: Enable axi emac via Kconfig
Enable driver by default for all platforms.
---
Changes in v2: None
configs/microblaze-generic_defconfig | 1 + include/configs/microblaze-generic.h | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-)
configs/microblaze-generic_defconfig +1 -0
@@ -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
include/configs/microblaze-generic.h +1 -5
@@ -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
Signature · 1 line
1.9.1
PATCH v2 2/9 microblaze: Move eth configuration to Kconfig
In reply to Michal SimekCleanup board specific file.
---
Changes in v2: None
configs/microblaze-generic_defconfig | 3 +++ include/configs/microblaze-generic.h | 14 -------------- 2 files changed, 3 insertions(+), 14 deletions(-)
configs/microblaze-generic_defconfig +3 -0
@@ -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
include/configs/microblaze-generic.h +0 -14
@@ -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
Signature · 1 line
1.9.1
PATCH v2 3/9 microblaze: Remove systemace from board file
In reply to Michal SimekSystemace is ancient IP which is not tested. Remove it from default configuration.
---
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(-)
board/xilinx/microblaze-generic/xparameters.h +0 -5
@@ -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
include/configs/microblaze-generic.h +0 -15
@@ -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
Signature · 1 line
1.9.1
PATCH v2 4/9 microblaze: Remove CONFIG_FIT from board file
In reply to Michal SimekAnd enable it via defconfig by default.
---
Changes in v2: None
configs/microblaze-generic_defconfig | 2 ++ include/configs/microblaze-generic.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)
configs/microblaze-generic_defconfig +2 -0
@@ -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
include/configs/microblaze-generic.h +0 -1
@@ -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 )
Signature · 1 line
1.9.1
PATCH v2 5/9 microblaze: Move CONFIG_NETCONSOLE to Kconfig
In reply to Michal SimekCleanup board file.
---
Changes in v2: None
configs/microblaze-generic_defconfig | 1 + include/configs/microblaze-generic.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
configs/microblaze-generic_defconfig +1 -0
@@ -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
include/configs/microblaze-generic.h +0 -1
@@ -286,7 +286,6 @@#define CONFIG_CMDLINE_EDITING -#define CONFIG_NETCONSOLE #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* Use the HUSH parser */
Signature · 1 line
1.9.1
PATCH v2 6/9 microblaze: Remove empty file - cpu.c
In reply to Michal SimekNo need to have empty unused file in architecture code.
---
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
arch/microblaze/cpu/Makefile +1 -1
@@ -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
arch/microblaze/cpu/cpu.c deleted +0 -9
@@ -1,9 +0,0 @@ -/* -* (C) Copyright 2004 Atmark Techno, Inc. -* -* Yasushi SHOJI <[email protected]> -* -* SPDX-License-Identifier: GPL-2.0+ -*/ - -/* EMPTY FILE */
Signature · 1 line
1.9.1
PATCH v2 7/9 microblaze: Read information about RAM from DT
In reply to Michal SimekDo not setup ram start/size in board file. Read it from DT instead.
---
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(-)
board/xilinx/microblaze-generic/microblaze-generic.c +0 -9
@@ -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[]) {
board/xilinx/microblaze-generic/xparameters.h +0 -4
@@ -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
include/configs/microblaze-generic.h +1 -8
@@ -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"
Signature · 1 line
1.9.1
PATCH v2 8/9 microblaze: Enable HUSH via Kconfig
In reply to Michal SimekCleanup board file.
---
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(-)
configs/microblaze-generic_defconfig +1 -0
@@ -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
include/configs/microblaze-generic.h +0 -3
@@ -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
Signature · 1 line
1.9.1
PATCH v2 9/9 microblaze: Fix board_init calling sequence
In reply to Michal Simekboard_init() is in final elf file but it is not called at all. Use board_init_late() instead and call gpio_init() from it.
---
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(-)
board/xilinx/microblaze-generic/microblaze-generic.c +4 -2
@@ -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 ; }
include/configs/microblaze-generic.h +1 -0
@@ -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
Signature · 1 line
1.9.1