Merge branch 'master' of git://git.denx.de/u-boot-mips

[platform/kernel/u-boot.git] / include / configs / cam_enc_4xx.h

diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h
index b27551d..c1042ae 100644 (file)
--- a/include/configs/cam_enc_4xx.h
+++ b/include/configs/cam_enc_4xx.h
@@ -4,20 +4,7 @@
  * Copyright (C) 2011
  * Heiko Schocher, DENX Software Engineering, hs@denx.de.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -30,7 +17,6 @@
 #define CONFIG_ARM926EJS                               /* arm926ejs CPU */
 #define CONFIG_SYS_TIMERBASE           0x01c21400      /* use timer 0 */
 #define CONFIG_SYS_HZ_CLOCK            24000000        /* timer0 freq */
-#define CONFIG_SYS_HZ                  1000
 #define CONFIG_SOC_DM365
 
 #define CONFIG_MACH_TYPE       MACH_TYPE_DAVINCI_DM365_EVM
@@ -62,7 +48,6 @@
 #define CONFIG_EMAC_MDIO_PHY_NUM       0
 #define        CONFIG_SYS_EMAC_TI_CLKDIV       0xa9    /* 1MHz */
 #define CONFIG_MII
-#define CONFIG_BOOTP_DEFAULT
 #define CONFIG_BOOTP_DNS
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
@@ -230,6 +215,8 @@
 #define CONFIG_SPL_STACK               (0x00010000 + 0x7f00)
 
 #define CONFIG_SPL_TEXT_BASE           0x00000020 /*CONFIG_SYS_SRAM_START*/
+/* Provide at least 16MB spacing between us and the Linux Kernel image */
+#define CONFIG_SPL_PAD_TO              12320
 #define CONFIG_SPL_MAX_FOOTPRINT       12288
 
 #ifndef CONFIG_SPL_BUILD