Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-20 11:55:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

board/km: remove CONFIG_KM_BOARD_NAME

Browse source 
We can use the existing CONFIG_SYS_CONFIG_NAME define for that and
remove the option. Also fix the boot string for all km83xx boards.

Signed-off-by: Holger Brunck <holger.brunck@ch.abb.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
CC: Priyanka Jain <priyanka.jain@nxp.com>
CC: Valentin Longchamp <valentin.longchamp@ch.abb.com>
This commit is contained in:
Holger Brunck 2019-11-26 19:09:02 +01:00 • committed by Priyanka Jain
parent 05577fa518
commit aeda123a20
13 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
board/keymile/km83xx/km83xx.c
View file

@ -277,7 +277,7 @@ int dram_init(void)
int checkboard(void) int checkboard(void)
{ {
puts("Board: Keymile " CONFIG_KM_BOARD_NAME); puts("Board: ABB " CONFIG_SYS_CONFIG_NAME);
if (piggy_present()) if (piggy_present())
puts(" with PIGGY."); puts(" with PIGGY.");

2
board/keymile/kmp204x/kmp204x.c
View file

@ -29,7 +29,7 @@ static uchar ivm_content[CONFIG_SYS_IVM_EEPROM_MAX_LEN];
int checkboard(void) int checkboard(void)
{ {
printf("Board: Keymile %s\n", CONFIG_KM_BOARD_NAME); printf("Board: Keymile %s\n", CONFIG_SYS_CONFIG_NAME);
return 0; return 0;
} }

1
include/configs/kmcoge5ne.h
View file

@ -9,7 +9,6 @@
#define __CONFIG_H #define __CONFIG_H
#define CONFIG_HOSTNAME "kmcoge5ne" #define CONFIG_HOSTNAME "kmcoge5ne"
#define CONFIG_KM_BOARD_NAME "kmcoge5ne"
#define CONFIG_NAND_ECC_BCH #define CONFIG_NAND_ECC_BCH
#define CONFIG_NAND_KMETER1 #define CONFIG_NAND_KMETER1
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1

1
include/configs/kmeter1.h
View file

@ -9,7 +9,6 @@
#define __CONFIG_H #define __CONFIG_H
#define CONFIG_HOSTNAME "kmeter1" #define CONFIG_HOSTNAME "kmeter1"
#define CONFIG_KM_BOARD_NAME "kmeter1"
/* include common defines/options for all Keymile boards */ /* include common defines/options for all Keymile boards */
#include "km/keymile-common.h" #include "km/keymile-common.h"

1
include/configs/kmopti2.h
View file

@ -23,7 +23,6 @@
/* /*
* High Level Configuration Options * High Level Configuration Options
*/ */
#define CONFIG_KM_BOARD_NAME "kmopti2"
#define CONFIG_HOSTNAME "kmopti2" #define CONFIG_HOSTNAME "kmopti2"
/* include common defines/options for all Keymile boards */ /* include common defines/options for all Keymile boards */

1
include/configs/kmp204x.h
View file

@ -9,7 +9,6 @@
#if defined(CONFIG_KMCOGE4) #if defined(CONFIG_KMCOGE4)
#define CONFIG_HOSTNAME "kmcoge4" #define CONFIG_HOSTNAME "kmcoge4"
#define CONFIG_KM_BOARD_NAME "kmcoge4"
#else #else
#error ("Board not supported") #error ("Board not supported")

1
include/configs/kmsupx5.h
View file

@ -23,7 +23,6 @@
/* /*
* High Level Configuration Options * High Level Configuration Options
*/ */
#define CONFIG_KM_BOARD_NAME "kmsupx5"
#define CONFIG_HOSTNAME "kmsupx5" #define CONFIG_HOSTNAME "kmsupx5"
/* include common defines/options for all Keymile boards */ /* include common defines/options for all Keymile boards */

1
include/configs/kmtegr1.h
View file

@ -21,7 +21,6 @@
*/ */
#define CONFIG_HOSTNAME "kmtegr1" #define CONFIG_HOSTNAME "kmtegr1"
#define CONFIG_KM_BOARD_NAME "kmtegr1"
#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" #define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0"
#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" #define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1"

1
include/configs/kmtepr2.h
View file

@ -23,7 +23,6 @@
/* /*
* High Level Configuration Options * High Level Configuration Options
*/ */
#define CONFIG_KM_BOARD_NAME "kmtepr2"
#define CONFIG_HOSTNAME "kmtepr2" #define CONFIG_HOSTNAME "kmtepr2"
/* include common defines/options for all Keymile boards */ /* include common defines/options for all Keymile boards */

1
include/configs/suvd3.h
View file

@ -21,7 +21,6 @@
*/ */
#define CONFIG_HOSTNAME "suvd3" #define CONFIG_HOSTNAME "suvd3"
#define CONFIG_KM_BOARD_NAME "suvd3"
/* include common defines/options for all Keymile boards */ /* include common defines/options for all Keymile boards */
#include "km/keymile-common.h" #include "km/keymile-common.h"

1
include/configs/tuge1.h
View file

@ -23,7 +23,6 @@
/* /*
* High Level Configuration Options * High Level Configuration Options
*/ */
#define CONFIG_KM_BOARD_NAME "tuge1"
#define CONFIG_HOSTNAME "tuge1" #define CONFIG_HOSTNAME "tuge1"
/* include common defines/options for all Keymile boards */ /* include common defines/options for all Keymile boards */

1
include/configs/tuxx1.h
View file

@ -23,7 +23,6 @@
/* /*
* High Level Configuration Options * High Level Configuration Options
*/ */
#define CONFIG_KM_BOARD_NAME "tuxx1"
#define CONFIG_HOSTNAME "tuxx1" #define CONFIG_HOSTNAME "tuxx1"
/* include common defines/options for all Keymile boards */ /* include common defines/options for all Keymile boards */

1
scripts/config_whitelist.txt
View file

@ -924,7 +924,6 @@ CONFIG_KMCOGE4
CONFIG_KMP204X CONFIG_KMP204X
CONFIG_KMTEGR1 CONFIG_KMTEGR1
CONFIG_KM_BOARD_EXTRA_ENV CONFIG_KM_BOARD_EXTRA_ENV
CONFIG_KM_BOARD_NAME
CONFIG_KM_COGE5UN CONFIG_KM_COGE5UN
CONFIG_KM_DEF_ARCH CONFIG_KM_DEF_ARCH
CONFIG_KM_DEF_BOOT_ARGS_CPU CONFIG_KM_DEF_BOOT_ARGS_CPU