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

[u-boot] / include / configs / xilinx-ppc.h

diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h
index 1235c373e9e395bdbe3393fddaff767923f3bc02..f4f42c510d171471bbc61f50695f994d383f7445 100644 (file)
--- a/include/configs/xilinx-ppc.h
+++ b/include/configs/xilinx-ppc.h
@@ -6,17 +6,7 @@
  *  (C) Copyright 2008
  *  Georg Schardt <schardt@team-ctech.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, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier:    GPL-2.0+
 */
 
 #ifndef __CONFIG_XLX_H
@@ -118,7 +108,7 @@
 /* serial communication */
 #ifdef XPAR_UARTLITE_0_BASEADDR
 #define CONFIG_XILINX_UARTLITE
-#define CONFIG_SERIAL_BASE             XPAR_UARTLITE_0_BASEADDR
+#define XILINX_UARTLITE_BASEADDR       XPAR_UARTLITE_0_BASEADDR
 #define CONFIG_BAUDRATE                        XPAR_UARTLITE_0_BAUDRATE
 #define CONFIG_SYS_BAUDRATE_TABLE      { CONFIG_BAUDRATE }
 #else