[U-Boot] [PATCH] nios2: zap nios2-generic board dir

Marek Vasut marex at denx.de
Sun Oct 18 17:35:48 CEST 2015


On Sunday, October 18, 2015 at 10:36:32 AM, Thomas Chou wrote:
> As we use device tree to control u-boot now, the generic
> board can be removed.
> 
> Signed-off-by: Thomas Chou <thomas at wytron.com.tw>

Hi!

> ---
>  arch/nios2/Kconfig                         | 16 ++----
>  arch/nios2/config.mk                       |  3 +-
>  board/altera/common/cfide.c                | 33 -----------
>  board/altera/nios2-generic/Kconfig         | 12 ----
>  board/altera/nios2-generic/MAINTAINERS     |  6 --
>  board/altera/nios2-generic/Makefile        | 10 ----
>  board/altera/nios2-generic/config.mk       | 12 ----
>  board/altera/nios2-generic/custom_fpga.h   | 89
> ------------------------------ board/altera/nios2-generic/nios2-generic.c
> | 76 ------------------------- configs/nios2-generic_defconfig           
> |  2 +-
>  include/configs/nios2-generic.h            | 23 +++++---
>  11 files changed, 24 insertions(+), 258 deletions(-)
>  delete mode 100644 board/altera/common/cfide.c
>  delete mode 100644 board/altera/nios2-generic/Kconfig
>  delete mode 100644 board/altera/nios2-generic/MAINTAINERS
>  delete mode 100644 board/altera/nios2-generic/Makefile
>  delete mode 100644 board/altera/nios2-generic/config.mk
>  delete mode 100644 board/altera/nios2-generic/custom_fpga.h
>  delete mode 100644 board/altera/nios2-generic/nios2-generic.c
> 
> diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig
> index 8ae7f6e..bb4fb2a 100644
> --- a/arch/nios2/Kconfig
> +++ b/arch/nios2/Kconfig
> @@ -4,15 +4,11 @@ menu "Nios II architecture"
>  config SYS_ARCH
>  	default "nios2"
> 
> -choice
> -	prompt "Target select"
> -	optional
> -
> -config TARGET_NIOS2_GENERIC
> -	bool "Support nios2-generic"
> -
> -endchoice
> -
> -source "board/altera/nios2-generic/Kconfig"
> +config SYS_CONFIG_NAME
> +	string "Board header file"
> +	help
> +	  This option should contain the base name of board header file.
> +	  The header file include/configs/<CONFIG_SYS_CONFIG_NAME>.h
> +	  should be included from include/config.h.

I suspect we don't want this, since we're probing from DT. This option
should default to something like include/configs/nios2.h , no ?

>  endmenu
> diff --git a/arch/nios2/config.mk b/arch/nios2/config.mk
> index 82bd887..2abad3f 100644
> --- a/arch/nios2/config.mk
> +++ b/arch/nios2/config.mk
> @@ -10,10 +10,11 @@ ifeq ($(CROSS_COMPILE),)
>  CROSS_COMPILE := nios2-elf-
>  endif
> 
> -CONFIG_STANDALONE_LOAD_ADDR ?= 0x02000000
> +CONFIG_STANDALONE_LOAD_ADDR ?= 0xd2000000

This doesn't look like a removal of generic board ;-)

>  PLATFORM_CPPFLAGS += -D__NIOS2__
>  PLATFORM_CPPFLAGS += -G0
> +PLATFORM_CPPFLAGS += -mno-hw-div -mno-hw-mul

This doesn't look that way either, you might want to split this patch
into a series.

>  LDFLAGS_FINAL += --gc-sections
>  PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections

[...]

I'm really happy to see the generic board go, thanks!


More information about the U-Boot mailing list