projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
[platform/kernel/u-boot.git]
/
include
/
configs
/
mx7ulp_evk.h
diff --git
a/include/configs/mx7ulp_evk.h
b/include/configs/mx7ulp_evk.h
index
6ab8db3
..
b8dcaa1
100644
(file)
--- a/
include/configs/mx7ulp_evk.h
+++ b/
include/configs/mx7ulp_evk.h
@@
-1,9
+1,8
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Freescale Semiconductor, Inc.
*
* Configuration settings for the Freescale i.MX7ULP EVK board.
/*
* Copyright (C) 2016 Freescale Semiconductor, Inc.
*
* Configuration settings for the Freescale i.MX7ULP EVK board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MX7ULP_EVK_CONFIG_H
*/
#ifndef __MX7ULP_EVK_CONFIG_H
@@
-28,8
+27,6
@@
#define IRAM_BASE_ADDR OCRAM_0_BASE
#define IOMUXC_BASE_ADDR IOMUXC1_RBASE
#define IRAM_BASE_ADDR OCRAM_0_BASE
#define IOMUXC_BASE_ADDR IOMUXC1_RBASE
-#define CONFIG_BOUNCE_BUFFER
-#define CONFIG_FSL_ESDHC
#define CONFIG_FSL_USDHC
#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
#define CONFIG_FSL_USDHC
#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
@@
-47,7
+44,6
@@
/* Using ULP WDOG for reset */
#define WDOG_BASE_ADDR WDG1_RBASE
/* Using ULP WDOG for reset */
#define WDOG_BASE_ADDR WDG1_RBASE
-#define CONFIG_SYS_ARCH_TIMER
#define CONFIG_SYS_HZ_CLOCK 1000000 /* Fixed at 1Mhz from TSTMR */
#define CONFIG_INITRD_TAG
#define CONFIG_SYS_HZ_CLOCK 1000000 /* Fixed at 1Mhz from TSTMR */
#define CONFIG_INITRD_TAG
@@
-65,12
+61,8
@@
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX 1
#define CONFIG_BAUDRATE 115200
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
-
#define CONFIG_SYS_CACHELINE_SIZE 64
/* Miscellaneous configurable options */
#define CONFIG_SYS_CACHELINE_SIZE 64
/* Miscellaneous configurable options */
@@
-79,12
+71,8
@@
#define CONFIG_SYS_MAXARGS 256
#define CONFIG_SYS_MAXARGS 256
-#define CONFIG_CMDLINE_EDITING
-
/* Physical Memory Map */
/* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS 1
-#define CONFIG_SYS_TEXT_BASE 0x67800000
#define PHYS_SDRAM 0x60000000
#define PHYS_SDRAM_SIZE SZ_1G
#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM
#define PHYS_SDRAM 0x60000000
#define PHYS_SDRAM_SIZE SZ_1G
#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM
@@
-92,7
+80,6
@@
#define CONFIG_LOADADDR 0x60800000
#define CONFIG_LOADADDR 0x60800000
-#define CONFIG_CMD_MEMTEST
#define CONFIG_SYS_MEMTEST_END 0x9E000000
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CONFIG_SYS_MEMTEST_END 0x9E000000
#define CONFIG_EXTRA_ENV_SETTINGS \