mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-08-25 03:18:51 +09:00
Merge branch 'master' of git://git.denx.de/u-boot-nds32
* 'master' of git://git.denx.de/u-boot-nds32: nds32/lib: add ide generic support nds32: enhance io.h for compatibility with periphals ftide020: fix incorrect information display format
This commit is contained in:
commit
3bf03add54
@ -165,6 +165,24 @@ static inline unsigned int readl(unsigned int *addr)
|
|||||||
#define __raw_base_readw(base, off) __arch_base_getw(base, off)
|
#define __raw_base_readw(base, off) __arch_base_getw(base, off)
|
||||||
#define __raw_base_readl(base, off) __arch_base_getl(base, off)
|
#define __raw_base_readl(base, off) __arch_base_getl(base, off)
|
||||||
|
|
||||||
|
#define out_arch(type, endian, a, v) __raw_write##type(cpu_to_##endian(v), a)
|
||||||
|
#define in_arch(type, endian, a) endian##_to_cpu(__raw_read##type(a))
|
||||||
|
|
||||||
|
#define out_le32(a, v) out_arch(l, le32, a, v)
|
||||||
|
#define out_le16(a, v) out_arch(w, le16, a, v)
|
||||||
|
|
||||||
|
#define in_le32(a) in_arch(l, le32, a)
|
||||||
|
#define in_le16(a) in_arch(w, le16, a)
|
||||||
|
|
||||||
|
#define out_be32(a, v) out_arch(l, be32, a, v)
|
||||||
|
#define out_be16(a, v) out_arch(w, be16, a, v)
|
||||||
|
|
||||||
|
#define in_be32(a) in_arch(l, be32, a)
|
||||||
|
#define in_be16(a) in_arch(w, be16, a)
|
||||||
|
|
||||||
|
#define out_8(a, v) __raw_writeb(v, a)
|
||||||
|
#define in_8(a) __raw_readb(a)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Now, pick up the machine-defined IO definitions
|
* Now, pick up the machine-defined IO definitions
|
||||||
* #include <asm/arch/io.h>
|
* #include <asm/arch/io.h>
|
||||||
|
@ -351,6 +351,11 @@ void board_init_r(gd_t *id, ulong dest_addr)
|
|||||||
nand_init(); /* go init the NAND */
|
nand_init(); /* go init the NAND */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(CONFIG_CMD_IDE)
|
||||||
|
puts("IDE: ");
|
||||||
|
ide_init();
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_GENERIC_MMC
|
#ifdef CONFIG_GENERIC_MMC
|
||||||
puts("MMC: ");
|
puts("MMC: ");
|
||||||
mmc_initialize(gd->bd);
|
mmc_initialize(gd->bd);
|
||||||
|
@ -316,10 +316,9 @@ int ide_preinit(void)
|
|||||||
|
|
||||||
/* auto-detect IDE controller */
|
/* auto-detect IDE controller */
|
||||||
if (ftide_controller_probe()) {
|
if (ftide_controller_probe()) {
|
||||||
printf("Faraday %s driver version %s\n", FTIDE_IP_NAME,
|
printf("FTIDE020_S\n");
|
||||||
FTIDE_DRIVER_VERSION);
|
|
||||||
} else {
|
} else {
|
||||||
printf("Faraday ATA controller not found.\n");
|
printf("FTIDE020_S ATA controller not found.\n");
|
||||||
return API_ENODEV;
|
return API_ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user