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

diff --cc arch/nds32/cpu/n1213/Makefile
Simple merge

diff --cc arch/nds32/cpu/n1213/ag101/Makefile
Simple merge

diff --cc arch/nds32/cpu/n1213/ag101/lowlevel_init.S
Simple merge

diff --cc arch/nds32/cpu/n1213/ag101/timer.c
Simple merge

diff --cc arch/nds32/cpu/n1213/ag102/Makefile
Simple merge

diff --cc arch/nds32/cpu/n1213/ag102/lowlevel_init.S
Simple merge

diff --cc arch/nds32/cpu/n1213/ag102/timer.c
Simple merge

diff --cc arch/nds32/lib/Makefile
Simple merge

diff --cc board/AndesTech/adp-ag101/Makefile
Simple merge

diff --cc board/AndesTech/adp-ag101/adp-ag101.c
Simple merge

diff --cc board/AndesTech/adp-ag101p/Makefile
Simple merge

diff --cc board/AndesTech/adp-ag101p/adp-ag101p.c
Simple merge

diff --cc board/AndesTech/adp-ag102/Makefile
Simple merge

diff --cc board/AndesTech/adp-ag102/adp-ag102.c
Simple merge

diff --cc drivers/block/ftide020.c
Simple merge

diff --cc drivers/mmc/ftsdc010_mci.c
Simple merge

diff --cc drivers/pci/pci_ftpci100.c
Simple merge

diff --cc include/common.h
Simple merge

diff --cc include/configs/adp-ag101.h
Simple merge

diff --cc include/configs/adp-ag101p.h
Simple merge

diff --cc include/faraday/ftpci100.h
index 0000000000000000000000000000000000000000,7a4945a73ac079273c4b6542dfb002f8ab66e124..43152aae2b320b2eef480f24b39bf95889f0c86f
mode 000000,100644..100644
--- /dev/null
--- 2/include/faraday/ftpci100.h
+++ b/include/faraday/ftpci100.h
@@@ -1,0 -1,96 +1,84 @@@
 - * 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
+ /*
+  * Faraday FTPCI100 PCI Bridge Controller Device Driver Implementation
+  *
+  * Copyright (C) 2010 Andes Technology Corporation
+  * Gavin Guo, Andes Technology Corporation <gavinguo@andestech.com>
+  * Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com>
+  *
++ * SPDX-License-Identifier:   GPL-2.0+
+  */
+ 
+ #ifndef __FTPCI100_H
+ #define __FTPCI100_H
+ 
+ /* AHB Control Registers */
+ struct ftpci100_ahbc {
+       unsigned int iosize;            /* 0x00 - I/O Space Size Signal */
+       unsigned int prot;              /* 0x04 - AHB Protection */
+       unsigned int rsved[8];          /* 0x08-0x24 - Reserved */
+       unsigned int conf;              /* 0x28 - PCI Configuration */
+       unsigned int data;              /* 0x2c - PCI Configuration DATA */
+ };
+ 
+ /*
+  * FTPCI100_IOSIZE_REG's constant definitions
+  */
+ #define FTPCI100_BASE_IO_SIZE(x)      (ffs(x) - 1)    /* 1M - 2048M */
+ 
+ /*
+  * PCI Configuration Register
+  */
+ #define PCI_INT_MASK                  0x4c
+ #define PCI_MEM_BASE_SIZE1            0x50
+ #define PCI_MEM_BASE_SIZE2            0x54
+ #define PCI_MEM_BASE_SIZE3            0x58
+ 
+ /*
+  * PCI_INT_MASK's bit definitions
+  */
+ #define PCI_INTA_ENABLE                       (1 << 22)
+ #define PCI_INTB_ENABLE                       (1 << 23)
+ #define PCI_INTC_ENABLE                       (1 << 24)
+ #define PCI_INTD_ENABLE                       (1 << 25)
+ 
+ /*
+  * PCI_MEM_BASE_SIZE1's constant definitions
+  */
+ #define FTPCI100_BASE_ADR_SIZE(x)     ((ffs(x) - 1) << 16)    /* 1M - 2048M */
+ 
+ #define FTPCI100_MAX_FUNCTIONS                20
+ #define PCI_IRQ_LINES                 4
+ 
+ #define MAX_BUS_NUM                   256
+ #define MAX_DEV_NUM                   32
+ #define MAX_FUN_NUM                   8
+ 
+ #define PCI_MAX_BAR_PER_FUNC          6
+ 
+ /*
+  * PCI_MEM_SIZE
+  */
+ #define FTPCI100_MEM_SIZE(x)          (ffs(x) << 24)
+ 
+ /* This definition is used by pci_ftpci_init() */
+ #define FTPCI100_BRIDGE_VENDORID              0x159b
+ #define FTPCI100_BRIDGE_DEVICEID              0x4321
+ 
+ void pci_ftpci_init(void);
+ 
+ struct pcibar {
+       unsigned int size;
+       unsigned int addr;
+ };
+ 
+ struct pci_config {
+       unsigned int bus;
+       unsigned int dev;                               /* device */
+       unsigned int func;
+       unsigned int pin;
+       unsigned short v_id;                            /* vendor id */
+       unsigned short d_id;                            /* device id */
+       struct pcibar bar[PCI_MAX_BAR_PER_FUNC + 1];
+ };
+ 
+ #endif

diff --cc include/ide.h
Simple merge