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 '2019-03-25-master-imports'
[platform/kernel/u-boot.git]
/
include
/
configs
/
ids8313.h
diff --git
a/include/configs/ids8313.h
b/include/configs/ids8313.h
index
12eb07d
..
7e4c497
100644
(file)
--- a/
include/configs/ids8313.h
+++ b/
include/configs/ids8313.h
@@
-1,3
+1,4
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013
* Heiko Schocher, DENX Software Engineering, hs@denx.de.
/*
* (C) Copyright 2013
* Heiko Schocher, DENX Software Engineering, hs@denx.de.
@@
-5,8
+6,6
@@
* Based on:
* Copyright (c) 2011 IDS GmbH, Germany
* Sergej Stepanov <ste@ids.de>
* Based on:
* Copyright (c) 2011 IDS GmbH, Germany
* Sergej Stepanov <ste@ids.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
*/
#ifndef __CONFIG_H
@@
-20,8
+19,6
@@
#define CONFIG_FSL_ELBC
#define CONFIG_FSL_ELBC
-#define CONFIG_MISC_INIT_R
-
#define CONFIG_BOOT_RETRY_TIME 900
#define CONFIG_BOOT_RETRY_MIN 30
#define CONFIG_RESET_TO_RETRY
#define CONFIG_BOOT_RETRY_TIME 900
#define CONFIG_BOOT_RETRY_MIN 30
#define CONFIG_RESET_TO_RETRY
@@
-162,21
+159,15
@@
*/
#define CONFIG_TSEC1
#define CONFIG_TSEC2
*/
#define CONFIG_TSEC1
#define CONFIG_TSEC2
-#define CONFIG_TSEC_ENET
-#define CONFIG_HARD_SPI
/*
* NOR FLASH setup
*/
/*
* NOR FLASH setup
*/
-#define CONFIG_SYS_FLASH_CFI
-#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_8BIT
#define CONFIG_FLASH_SHOW_PROGRESS 50
#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_8BIT
#define CONFIG_FLASH_SHOW_PROGRESS 50
-#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
#define CONFIG_SYS_FLASH_BASE 0xFF800000
#define CONFIG_SYS_FLASH_SIZE 8
#define CONFIG_SYS_FLASH_BASE 0xFF800000
#define CONFIG_SYS_FLASH_SIZE 8
-#define CONFIG_SYS_FLASH_PROTECTION
#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE
#define CONFIG_SYS_LBLAWAR0_PRELIM 0x80000016
#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE
#define CONFIG_SYS_LBLAWAR0_PRELIM 0x80000016
@@
-282,16
+273,6
@@
#define CONFIG_SYS_I2C_RTC_ADDR 0x51
/*
#define CONFIG_SYS_I2C_RTC_ADDR 0x51
/*
- * SPI setup
- */
-#ifdef CONFIG_HARD_SPI
-#define CONFIG_MPC8XXX_SPI
-#define CONFIG_SYS_GPIO1_PRELIM
-#define CONFIG_SYS_GPIO1_DIR 0x00000001
-#define CONFIG_SYS_GPIO1_DAT 0x00000001
-#endif
-
-/*
* Ethernet setup
*/
#ifdef CONFIG_TSEC1
* Ethernet setup
*/
#ifdef CONFIG_TSEC1
@@
-316,7
+297,6
@@
/*
* Serial Port
*/
/*
* Serial Port
*/
-#define CONFIG_CONS_INDEX 1
#define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_REG_SIZE 1
#define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_REG_SIZE 1
@@
-410,11
+390,6
@@
/*
* U-Boot environment setup
*/
/*
* U-Boot environment setup
*/
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_BOOTP_SUBNETMASK
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
/*
#define CONFIG_BOOTP_BOOTFILESIZE
/*
@@
-434,7
+409,7
@@
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
#define CONFIG_NETDEV eth1
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
#define CONFIG_NETDEV eth1
-#define CONFIG_HOSTNAME
ids8313
+#define CONFIG_HOSTNAME
"ids8313"
#define CONFIG_ROOTPATH "/opt/eldk-4.2/ppc_6xx"
#define CONFIG_BOOTFILE "ids8313/uImage"
#define CONFIG_UBOOTPATH "ids8313/u-boot.bin"
#define CONFIG_ROOTPATH "/opt/eldk-4.2/ppc_6xx"
#define CONFIG_BOOTFILE "ids8313/uImage"
#define CONFIG_UBOOTPATH "ids8313/u-boot.bin"
@@
-448,7
+423,6
@@
/*
* Miscellaneous configurable options
*/
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
@@
-456,7
+430,6
@@
#define CONFIG_SYS_MEMTEST_END 0x00C00000
#define CONFIG_SYS_LOAD_ADDR 0x100000
#define CONFIG_SYS_MEMTEST_END 0x00C00000
#define CONFIG_SYS_LOAD_ADDR 0x100000
-#define CONFIG_MII
#define CONFIG_LOADS_ECHO
#define CONFIG_TIMESTAMP
#define CONFIG_PREBOOT "echo;" \
#define CONFIG_LOADS_ECHO
#define CONFIG_TIMESTAMP
#define CONFIG_PREBOOT "echo;" \
@@
-469,8
+442,6
@@
#define CONFIG_JFFS2_DEV "0"
/* mtdparts command line support */
#define CONFIG_JFFS2_DEV "0"
/* mtdparts command line support */
-#define CONFIG_FLASH_CFI_MTD
-#define CONFIG_MTD_DEVICE
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=" __stringify(CONFIG_NETDEV) "\0" \
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=" __stringify(CONFIG_NETDEV) "\0" \
@@
-513,14
+484,5
@@
"bootm ${loadaddr} - ${fdtaddr}"
/* UBI Support */
"bootm ${loadaddr} - ${fdtaddr}"
/* UBI Support */
-#define CONFIG_MTD_PARTITIONS
-
-/* bootcount support */
-#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_BOOTCOUNT_I2C
-#define CONFIG_BOOTCOUNT_ALEN 1
-#define CONFIG_SYS_BOOTCOUNT_ADDR 0x9
-
-#define CONFIG_IMAGE_FORMAT_LEGACY
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */