diff options
| author | Evert Pap <evert.pap@sintecs.nl> | 2016-09-16 13:16:50 (GMT) |
|---|---|---|
| committer | vojo <joris.van.vossen@sintecs.nl> | 2017-08-23 08:07:14 (GMT) |
| commit | 91259b783fb00422df6157b85317bf5035c72ed4 (patch) | |
| tree | 2922ed570d93d45741573e20ef62053e0cc8adea /include | |
| parent | 82a006ca2df310164bb48c36a793d1b733cf4af8 (diff) | |
| download | u-boot-fsl-qoriq-91259b783fb00422df6157b85317bf5035c72ed4.tar.xz | |
merge with master
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 1 | ||||
| -rw-r--r-- | include/configs/simc-t10xx.h | 19 | ||||
| -rw-r--r-- | include/dm/platform_data/gpio_mpc8xxx.h | 21 |
3 files changed, 16 insertions, 25 deletions
diff --git a/include/common.h b/include/common.h index c8fb277..958a40e 100644 --- a/include/common.h +++ b/include/common.h @@ -42,6 +42,7 @@ typedef volatile unsigned char vu_char; #define CONFIG_SYS_SUPPORT_64BIT_DATA #endif +#define DEBUG #ifdef DEBUG #define _DEBUG 1 #else diff --git a/include/configs/simc-t10xx.h b/include/configs/simc-t10xx.h index f53c201..49550b7 100644 --- a/include/configs/simc-t10xx.h +++ b/include/configs/simc-t10xx.h @@ -10,6 +10,9 @@ #include "simc-t10x0.h" #include <generated/autoconf.h> + +#define MPC85XX_GPIO_NR(port, pin) ((((port)-1)*32)+((pin)&31)) + /* * SIMC-T10xx board configuration file */ @@ -186,9 +189,20 @@ */ #define CONFIG_SYS_INIT_L3_ADDR 0xFFFC0000 #define CONFIG_SYS_L3_SIZE 256 << 10 -#define CONFIG_SPL_GD_ADDR (CONFIG_SYS_INIT_L3_ADDR + 32 * 1024) +/* TODO CLEANUP #define CONFIG_SPL_GD_ADDR (CONFIG_SYS_INIT_L3_ADDR + 32 * 1024) */ #ifdef CONFIG_RAMBOOT_PBL #define CONFIG_ENV_ADDR (CONFIG_SPL_GD_ADDR + 4 * 1024) + + +/* + * For Secure Boot CONFIG_SYS_INIT_L3_ADDR will be redefined and hence + * Physical address (CONFIG_SYS_INIT_L3_ADDR) and virtual address + * (CONFIG_SYS_INIT_L3_VADDR) will be different. + */ +#define CONFIG_SYS_INIT_L3_VADDR 0xFFFC0000 +#define CONFIG_SPL_GD_ADDR (CONFIG_SYS_INIT_L3_VADDR + 32 * 1024) + + #endif /* CONFIG_RAMBOOT_PBL */ #define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SPL_GD_ADDR + 12 * 1024) #define CONFIG_SPL_RELOC_MALLOC_SIZE (30 << 10) @@ -623,8 +637,6 @@ #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS -#define CONFIG_CMD_BOOTZ - #define CONFIG_SYS_NO_FLASH @@ -666,7 +678,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000 -#define CONFIG_BOOTDELAY 3 /*-1 disables auto-boot*/ #define CONFIG_ZERO_BOOTDELAY_CHECK /* Also check for boot interruption, when bootdelay is zero */ #define CONFIG_BAUDRATE 115200 diff --git a/include/dm/platform_data/gpio_mpc8xxx.h b/include/dm/platform_data/gpio_mpc8xxx.h deleted file mode 100644 index 37e5241..0000000 --- a/include/dm/platform_data/gpio_mpc8xxx.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2016 Scalys B.V. <u-boot@scalys.com> - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef _MPC8XXX_GPIO_H -#define _MPC8XXX_GPIO_H - -struct mpc8xxx_gpio_platdata { - const char *bank_name; - ccsr_gpio_t *regs; - int gpio_count; -#if defined(CONFIG_MPC8572) || defined(CONFIG_MPC8536) - /* shadowed data register used to work around errata on - * MPC8572 and MPC8535 where it is not possible to read the - * state of an output pin */ - uint32_t data; -#endif -}; - -#endif |