diff options
| -rw-r--r-- | include/configs/dreamplug.h | 29 | ||||
| -rw-r--r-- | include/configs/guruplug.h | 44 | ||||
| -rw-r--r-- | include/configs/mv-plug-common.h | 64 | ||||
| -rw-r--r-- | include/configs/sheevaplug.h | 40 |
4 files changed, 70 insertions, 107 deletions
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 97b3def..3f35616 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -34,35 +34,19 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ -#define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_TYPE MACH_TYPE_DREAMPLUG -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ - -/* Add target to build it automatically upon "make" */ -#define CONFIG_BUILD_TARGET "u-boot.kwb" - -/* - * Enable device tree support - */ -#define CONFIG_OF_LIBFDT /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#define CONFIG_CMD_DATE -#define CONFIG_CMD_ENV #define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 #define CONFIG_CMD_FAT -#define CONFIG_CMD_IDE -#define CONFIG_CMD_MII /* - * mv-common.h should be defined after CMD configs since it used them + * mv-plug-common.h should be defined after CMD configs since it used them * to enable certain macros */ -#include "mv-common.h" +#include "mv-plug-common.h" /* * Environment variables configurations @@ -122,13 +106,4 @@ #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET #endif /*CONFIG_MVSATA_IDE*/ -/* - * RTC driver configuration - */ -#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - -#define CONFIG_SYS_ALT_MEMTEST - #endif /* _CONFIG_DREAMPLUG_H */ diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 3a1f0fa..712bfd7 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -20,33 +20,7 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ -#define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_GURUPLUG /* Machine type */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ - -/* Add target to build it automatically upon "make" */ -#define CONFIG_BUILD_TARGET "u-boot.kwb" - -/* - * Compression configuration - */ -#define CONFIG_BZIP2 -#define CONFIG_LZMA - -/* - * Enable device tree support - */ -#define CONFIG_OF_LIBFDT - -/* - * Commands configuration - */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#define CONFIG_CMD_BOOTZ -#define CONFIG_CMD_DATE -#define CONFIG_CMD_ENV -#define CONFIG_CMD_IDE -#define CONFIG_CMD_MII /* * Standard filesystems @@ -54,15 +28,10 @@ #define CONFIG_SYS_MVFS /* - * Extra file system - */ -#define CONFIG_CMD_EXT4 - -/* - * mv-common.h should be defined after CMD configs since it used them + * mv-plug-common.h should be defined after CMD configs since it used them * to enable certain macros */ -#include "mv-common.h" +#include "mv-plug-common.h" /* * Environment variables configurations @@ -126,13 +95,4 @@ #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET #endif /*CONFIG_MVSATA_IDE*/ -/* - * RTC driver configuration - */ -#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - -#define CONFIG_SYS_ALT_MEMTEST - #endif /* _CONFIG_GURUPLUG_H */ diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h new file mode 100644 index 0000000..d7d8d81 --- /dev/null +++ b/include/configs/mv-plug-common.h @@ -0,0 +1,64 @@ +/* + * (C) Copyright 2009-2015 + * Marvell Semiconductor <www.marvell.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _CONFIG_MARVELL_PLUG_H +#define _CONFIG_MARVELL_PLUG_H + + +/* + * High Level Configuration Options (easy to change) + */ +#define CONFIG_KW88F6281 1 /* SOC Name */ +#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ + +/* Add target to build it automatically upon "make" */ +#define CONFIG_BUILD_TARGET "u-boot.kwb" + +/* + * Compression configuration + */ +#ifdef CONFIG_SYS_MVFS +#define CONFIG_BZIP2 +#define CONFIG_LZMA +#define CONFIG_CMD_BOOTZ +#endif /* CONFIG_SYS_MVFS */ + +/* + * Enable device tree support + */ +#define CONFIG_OF_LIBFDT + +/* + * Commands configuration + */ +#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ +#define CONFIG_CMD_DATE +#define CONFIG_CMD_ENV +#define CONFIG_CMD_IDE +#define CONFIG_CMD_MII + +/* + * Extra file system + */ +#define CONFIG_CMD_EXT4 + +/* + * mv-common.h should be defined after CMD configs since it used them + * to enable certain macros + */ +#include "mv-common.h" + +/* + * RTC driver configuration + */ +#ifdef CONFIG_CMD_DATE +#define CONFIG_RTC_MV +#endif /* CONFIG_CMD_DATE */ + +#define CONFIG_SYS_ALT_MEMTEST + +#endif /* _CONFIG_MARVELL_PLUG_H */ diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index f466ee4..ebc3d64 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -20,33 +20,11 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ -#define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_SHEEVAPLUG /* Machine type */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ - -/* Add target to build it automatically upon "make" */ -#define CONFIG_BUILD_TARGET "u-boot.kwb" - -/* - * Compression configuration - */ -#define CONFIG_BZIP2 -#define CONFIG_LZMA - -/* - * Enable device tree support - */ -#define CONFIG_OF_LIBFDT /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#define CONFIG_CMD_BOOTZ -#define CONFIG_CMD_DATE -#define CONFIG_CMD_ENV -#define CONFIG_CMD_IDE -#define CONFIG_CMD_MII #define CONFIG_CMD_MMC /* @@ -55,15 +33,10 @@ #define CONFIG_SYS_MVFS /* - * Extra file system - */ -#define CONFIG_CMD_EXT4 - -/* - * mv-common.h should be defined after CMD configs since it used them + * mv-plug-common.h should be defined after CMD configs since it used them * to enable certain macros */ -#include "mv-common.h" +#include "mv-plug-common.h" /* * Environment variables configurations @@ -136,13 +109,4 @@ #define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET #endif /* CONFIG_CMD_IDE */ -/* - * RTC driver configuration - */ -#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - -#define CONFIG_SYS_ALT_MEMTEST - #endif /* _CONFIG_SHEEVAPLUG_H */ |