X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fconfigs%2Fintegratorcp.h;h=56931b78a621c8c246ba00fe38af6ca872e20492;hb=d7ac185fd840d1406fcafc1b412482138475af82;hp=7c1ef2483ea24da88bf9450314102efe80f894fb;hpb=c175f306b3f8885965f63ff6c71df5c0f899b4c9;p=oweals%2Fu-boot.git diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index 7c1ef2483e..56931b78a6 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2003 * Texas Instruments. @@ -8,8 +9,6 @@ * ARM Ltd. * Philippe Robin, * Configuration for Compact Integrator board. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H @@ -18,7 +17,6 @@ #include "integrator-common.h" /* Integrator CP-specific configuration */ -#define CONFIG_ARCH_CINTEGRATOR #define CONFIG_SYS_HZ_CLOCK 1000000 /* Timer 1 is clocked at 1Mhz */ /* @@ -29,22 +27,9 @@ #define CONFIG_SMC91111_BASE 0xC8000000 #undef CONFIG_SMC91111_EXT_PHY -/* PL011 configuration */ -#define CONFIG_PL011_SERIAL -#define CONFIG_PL011_CLOCK 14745600 -#define CONFIG_PL01x_PORTS { (void *)CONFIG_SYS_SERIAL0, (void *)CONFIG_SYS_SERIAL1 } -#define CONFIG_CONS_INDEX 0 -#define CONFIG_BAUDRATE 38400 -#define CONFIG_SYS_SERIAL0 0x16000000 -#define CONFIG_SYS_SERIAL1 0x17000000 - /* * Command line configuration. */ -#include - -#define CONFIG_BOOTDELAY 2 -#define CONFIG_BOOTARGS "root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0" #define CONFIG_BOOTCOMMAND "tftpboot ; bootm" #define CONFIG_SERVERIP 192.168.1.100 #define CONFIG_IPADDR 192.168.1.104 @@ -53,11 +38,8 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_PROMPT "Integrator-CP # " /* Monitor Command Prompt */ - #define PHYS_FLASH_SIZE 0x01000000 /* 16MB */ #define CONFIG_SYS_MAX_FLASH_SECT 64 -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_SYS_MONITOR_LEN 0x00100000 /*