Merge branch 'uboot'

[u-boot] / arch / powerpc / cpu / mpc85xx / p4080_ids.c

diff --git a/arch/powerpc/cpu/mpc85xx/p4080_ids.c b/arch/powerpc/cpu/mpc85xx/p4080_ids.c
index a6ea6af64fbc007ab5b5e40bfaa22779eec7e479..b2a23c0c9ebd775dd499f616866ba631db927984 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/p4080_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/p4080_ids.c
@@ -1,23 +1,7 @@
 /*
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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+
  */
 
 #include <common.h>
@@ -52,9 +36,9 @@ struct liodn_id_table liodn_tbl[] = {
 
        SET_SDHC_LIODN(1, 156),
 
-       SET_PCI_LIODN("fsl,p4080-pcie", 1, 193),
-       SET_PCI_LIODN("fsl,p4080-pcie", 2, 194),
-       SET_PCI_LIODN("fsl,p4080-pcie", 3, 195),
+       SET_PCI_LIODN(CONFIG_SYS_FSL_PCIE_COMPAT, 1, 193),
+       SET_PCI_LIODN(CONFIG_SYS_FSL_PCIE_COMPAT, 2, 194),
+       SET_PCI_LIODN(CONFIG_SYS_FSL_PCIE_COMPAT, 3, 195),
 
        SET_DMA_LIODN(1, 196),
        SET_DMA_LIODN(2, 197),