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 https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
[platform/kernel/u-boot.git]
/
include
/
configs
/
bcm28155_ap.h
diff --git
a/include/configs/bcm28155_ap.h
b/include/configs/bcm28155_ap.h
index
bd6d9ae
..
d807997
100644
(file)
--- a/
include/configs/bcm28155_ap.h
+++ b/
include/configs/bcm28155_ap.h
@@
-1,7
+1,6
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2013 Broadcom Corporation.
/*
* Copyright 2013 Broadcom Corporation.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __BCM28155_AP_H
*/
#ifndef __BCM28155_AP_H
@@
-20,7
+19,6
@@
#define CONFIG_SYS_SDRAM_BASE 0x80000000
#define CONFIG_SYS_SDRAM_SIZE 0x80000000
#define CONFIG_SYS_SDRAM_BASE 0x80000000
#define CONFIG_SYS_SDRAM_SIZE 0x80000000
-#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_SYS_MALLOC_LEN SZ_4M /* see armv7/start.S. */
#define CONFIG_SYS_MALLOC_LEN SZ_4M /* see armv7/start.S. */
@@
-56,7
+54,6
@@
#define CONFIG_SYS_TIMER_COUNTER (TIMER_BASE_ADDR + 4) /* STCLO offset */
/* Init functions */
#define CONFIG_SYS_TIMER_COUNTER (TIMER_BASE_ADDR + 4) /* STCLO offset */
/* Init functions */
-#define CONFIG_MISC_INIT_R /* board's misc_init_r function */
/* Some commands use this as the default load address */
#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE
/* Some commands use this as the default load address */
#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE
@@
-75,13
+72,10
@@
/* Post pad 3 bytes after each reg addr */
#define CONFIG_SYS_NS16550_REG_SIZE (-4)
#define CONFIG_SYS_NS16550_CLK 13000000
/* Post pad 3 bytes after each reg addr */
#define CONFIG_SYS_NS16550_REG_SIZE (-4)
#define CONFIG_SYS_NS16550_CLK 13000000
-#define CONFIG_CONS_INDEX 1
#define CONFIG_SYS_NS16550_COM1 0x3e000000
/* must fit into GPT:u-boot-env partition */
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_NS16550_COM1 0x3e000000
/* must fit into GPT:u-boot-env partition */
#define CONFIG_SYS_MMC_ENV_DEV 0
-#define CONFIG_ENV_OFFSET (0x00011a00 * 512)
-#define CONFIG_ENV_SIZE (8 * 512)
/* console configuration */
#define CONFIG_SYS_CBSIZE 1024 /* Console buffer size */
/* console configuration */
#define CONFIG_SYS_CBSIZE 1024 /* Console buffer size */
@@
-96,8
+90,6
@@
/* version string, parser, etc */
/* version string, parser, etc */
-#define CONFIG_MX_CYCLIC
-
/* Initial upstream - boot to cmd prompt only */
#define CONFIG_BOOTCOMMAND ""
/* Initial upstream - boot to cmd prompt only */
#define CONFIG_BOOTCOMMAND ""