Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'

[u-boot] / board / xilinx / ppc440-generic / xilinx_ppc440_generic.c

diff --git a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c
index 0867226fff0b33ce9a9ad910965b7ccf112c070f..74df2f4ff785fb0d44cbf00f0cce4ce2ca3a03f4 100644 (file)
--- a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c
+++ b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c
@@ -3,18 +3,7 @@
  * Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
  * This work has been supported by: QTechnology  http://qtec.com/
  *
- * 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, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier:    GPL-2.0+
 */
 
 #include <config.h>
@@ -37,7 +26,7 @@ int checkboard(void) __attribute__((weak, alias("__checkboard")));
 phys_size_t __initdram(int board_type)
 {
        return get_ram_size(XPAR_DDR2_SDRAM_MEM_BASEADDR,
-                           CFG_SDRAM_SIZE_MB * 1024 * 1024);
+                           CONFIG_SYS_SDRAM_SIZE_MB * 1024 * 1024);
 }
 phys_size_t initdram(int) __attribute__((weak, alias("__initdram")));