arm: kirkwood: Move common definitions into common file

Create include/configs/mv-plug-common.h for common definitions
for Sheevaplug, Guruplug and Dreamplug. This will make it easier
to ensure the built u-boots stay in track with each other

Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
This commit is contained in:
Quentin Armitage 2015-10-28 00:47:21 +00:00 committed by Luka Perkov
parent 310866b2e8
commit 38c0e864d3
4 changed files with 70 additions and 107 deletions

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */