Merge git://git.denx.de/u-boot-samsung

[u-boot] / arch / arm / include / asm / arch-at91 / at91sam9261.h

diff --git a/arch/arm/include/asm/arch-at91/at91sam9261.h b/arch/arm/include/asm/arch-at91/at91sam9261.h
index c85fd29b4620dda98d18ecfdc3ba25b0ca2c6b67..6dfcf4c0c865706205a790245a57b747cb74af07 100644 (file)
--- a/arch/arm/include/asm/arch-at91/at91sam9261.h
+++ b/arch/arm/include/asm/arch-at91/at91sam9261.h
@@ -12,10 +12,7 @@
  * therefore this file applies to all of them. Differences between
  * those SoCs are concentrated at the end of this file.
  *
- * 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.
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef AT91SAM9261_H
@@ -24,7 +21,6 @@
 /*
  * defines to be used in other places
  */
-#define CONFIG_ARM926EJS       /* ARM926EJS Core */
 #define CONFIG_AT91FAMILY      /* it's a member of AT91 */
 
 /*
@@ -104,7 +100,7 @@
 #define ATMEL_SIZE_SRAM                0x00028000      /* Internal SRAM size (160Kb) */
 
 #define ATMEL_BASE_ROM         0x00400000      /* Internal ROM base address */
-#define ATMEL_SIZE_ROM         SZ_32K          /* Internal ROM size (32Kb) */
+#define ATMEL_SIZE_ROM         0x00008000      /* Internal ROM size (32Kb) */
 
 #define ATMEL_BASE_UHP         0x00500000      /* USB Host controller */
 #define ATMEL_BASE_LCDC                0x00600000      /* LDC controller */
@@ -125,6 +121,7 @@
  * Other misc defines
  */
 #define ATMEL_PIO_PORTS                3               /* theese SoCs have 3 PIO */
+#define ATMEL_PMC_UHP          AT91SAM926x_PMC_UHP
 #define ATMEL_BASE_PIO         ATMEL_BASE_PIOA
 
 /*