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 tag 'xilinx-for-v2020.07-rc2' of https://gitlab.denx.de/u-boot/custodians/u...
[platform/kernel/u-boot.git]
/
include
/
configs
/
M5253DEMO.h
diff --git
a/include/configs/M5253DEMO.h
b/include/configs/M5253DEMO.h
index
ff0995e
..
9fc0f5f
100644
(file)
--- a/
include/configs/M5253DEMO.h
+++ b/
include/configs/M5253DEMO.h
@@
-1,14
+1,11
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/* Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
* Hayden Fraser (Hayden.Fraser@freescale.com)
/* Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
* Hayden Fraser (Hayden.Fraser@freescale.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _M5253DEMO_H
#define _M5253DEMO_H
*/
#ifndef _M5253DEMO_H
#define _M5253DEMO_H
-#define CONFIG_M5253DEMO /* define board type */
-
#define CONFIG_MCFTMR
#define CONFIG_MCFUART
#define CONFIG_MCFTMR
#define CONFIG_MCFUART
@@
-20,13
+17,6
@@
/* Configuration for environment
* Environment is embedded in u-boot in the second sector of the flash
*/
/* Configuration for environment
* Environment is embedded in u-boot in the second sector of the flash
*/
-#ifdef CONFIG_MONITOR_IS_IN_RAM
-# define CONFIG_ENV_OFFSET 0x4000
-# define CONFIG_ENV_SECT_SIZE 0x1000
-#else
-# define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x4000)
-# define CONFIG_ENV_SECT_SIZE 0x1000
-#endif
#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
@@
-79,7
+69,7
@@
""
#endif
""
#endif
-#define CONFIG_HOSTNAME
M5253DEMO
+#define CONFIG_HOSTNAME
"M5253DEMO"
/* I2C */
#define CONFIG_SYS_I2C
/* I2C */
#define CONFIG_SYS_I2C
@@
-92,8
+82,6
@@
#define CONFIG_SYS_I2C_PINMUX_CLR (0xFFFFE7FF)
#define CONFIG_SYS_I2C_PINMUX_SET (0)
#define CONFIG_SYS_I2C_PINMUX_CLR (0xFFFFE7FF)
#define CONFIG_SYS_I2C_PINMUX_SET (0)
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-
#define CONFIG_SYS_LOAD_ADDR 0x00100000
#define CONFIG_SYS_MEMTEST_START 0x400
#define CONFIG_SYS_LOAD_ADDR 0x00100000
#define CONFIG_SYS_MEMTEST_START 0x400
@@
-161,14
+149,12
@@
#define FLASH_SST6401B 0x200
#define SST_ID_xF6401B 0x236D236D
#define FLASH_SST6401B 0x200
#define SST_ID_xF6401B 0x236D236D
-#undef CONFIG_SYS_FLASH_CFI
#ifdef CONFIG_SYS_FLASH_CFI
/*
* Unable to use CFI driver, due to incompatible sector erase command by SST.
* Amd/Atmel use 0x30 for sector erase, SST use 0x50.
* 0x30 is block erase in SST
*/
#ifdef CONFIG_SYS_FLASH_CFI
/*
* Unable to use CFI driver, due to incompatible sector erase command by SST.
* Amd/Atmel use 0x30 for sector erase, SST use 0x50.
* 0x30 is block erase in SST
*/
-# define CONFIG_FLASH_CFI_DRIVER 1
# define CONFIG_SYS_FLASH_SIZE 0x800000
# define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT
# define CONFIG_FLASH_CFI_LEGACY
# define CONFIG_SYS_FLASH_SIZE 0x800000
# define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT
# define CONFIG_FLASH_CFI_LEGACY