X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fmvebu_armada-37xx.h;h=cf9440f90c762e86894e5020ecd1fd840d03da69;hb=87f78478a4a1bf574db0b0e575ca37cf91fb187c;hp=96cd435f618ef8d7fb910622470a46d96c0d353a;hpb=f3177d02f33472352b022adbaf5c47cceebc930d;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index 96cd435..cf9440f 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2016 Stefan Roese - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _CONFIG_MVEBU_ARMADA_37XX_H @@ -10,13 +9,10 @@ /* * High Level Configuration Options (easy to change) */ -#define CONFIG_DISPLAY_BOARDINFO_LATE /* additions for new ARM relocation support */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 -#define CONFIG_NR_DRAM_BANKS 1 - /* auto boot */ #define CONFIG_PREBOOT @@ -49,8 +45,6 @@ #define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */ #define CONFIG_SYS_MAXARGS 32 /* max number of command args */ -#define CONFIG_SYS_ALT_MEMTEST - /* End of 16M scrubbed by training in bootrom */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0xFF0000) @@ -70,6 +64,8 @@ #define CONFIG_SF_DEFAULT_SPEED 1000000 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ /* Environment in SPI NOR flash */ #define CONFIG_ENV_OFFSET 0x180000 /* as Marvell U-Boot version */ @@ -82,7 +78,6 @@ #define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */ #define CONFIG_ARP_TIMEOUT 200 #define CONFIG_NET_RETRY_COUNT 50 -#define CONFIG_PHY_MARVELL #define CONFIG_USB_MAX_CONTROLLER_COUNT (3 + 3) @@ -100,8 +95,6 @@ #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) -#include - #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 0) \