X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Funiphier.h;h=5c7a342d73d65ee494aa267dbbc154338385c1a4;hb=4a41cc157870cf752795adef811fa7ca9cb1b974;hp=d2d88dd29e14af124168d61c0cc76d21220869fa;hpb=6a3cffe8e189ca7ebd5bb801db7ec28b35ed9797;p=u-boot diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index d2d88dd29e..5c7a342d73 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -1,7 +1,5 @@ /* - * Copyright (C) 2012-2015 Panasonic Corporation - * Copyright (C) 2015 Socionext Inc. - * Author: Masahiro Yamada + * Copyright (C) 2012-2015 Masahiro Yamada * * SPDX-License-Identifier: GPL-2.0+ */ @@ -200,16 +198,10 @@ #define CONFIG_BOOTDELAY 3 #define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ -#define CONFIG_AUTOBOOT_KEYED 1 -#define CONFIG_AUTOBOOT_PROMPT \ - "Press SPACE to abort autoboot in %d seconds\n", bootdelay -#define CONFIG_AUTOBOOT_DELAY_STR "d" -#define CONFIG_AUTOBOOT_STOP_STR " " /* * Network Configuration */ -#define CONFIG_ETHADDR 00:21:83:24:00:00 #define CONFIG_SERVERIP 192.168.11.1 #define CONFIG_IPADDR 192.168.11.10 #define CONFIG_GATEWAYIP 192.168.11.1 @@ -267,8 +259,6 @@ #define CONFIG_SYS_SDRAM_SIZE (CONFIG_SDRAM0_SIZE) #endif -#define CONFIG_SYS_TEXT_BASE 0x84000000 - #if defined(CONFIG_MACH_PH1_LD4) || defined(CONFIG_MACH_PH1_SLD8) #define CONFIG_SPL_TEXT_BASE 0x00040000 #endif @@ -276,12 +266,8 @@ #define CONFIG_SPL_TEXT_BASE 0x00100000 #endif -#ifndef CONFIG_SPL_BUILD -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif - #define CONFIG_SPL_STACK (0x0ff08000) -#define CONFIG_SYS_INIT_SP_ADDR ((CONFIG_SYS_TEXT_BASE) - 0x00001000) +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE) #define CONFIG_PANIC_HANG