diff options
Diffstat (limited to 'arch/arm/boards/ls1046ardb')
-rw-r--r-- | arch/arm/boards/ls1046ardb/board.c | 6 | ||||
-rw-r--r-- | arch/arm/boards/ls1046ardb/lowlevel.c | 20 |
2 files changed, 12 insertions, 14 deletions
diff --git a/arch/arm/boards/ls1046ardb/board.c b/arch/arm/boards/ls1046ardb/board.c index 5e42209c8b..ee70171ca3 100644 --- a/arch/arm/boards/ls1046ardb/board.c +++ b/arch/arm/boards/ls1046ardb/board.c @@ -13,8 +13,8 @@ #include <linux/clk.h> #include <linux/clkdev.h> #include <asm/system.h> -#include <mach/layerscape.h> -#include <mach/bbu.h> +#include <mach/layerscape/layerscape.h> +#include <mach/layerscape/bbu.h> #include <of_address.h> #include <linux/fsl_ifc.h> @@ -33,7 +33,7 @@ struct nxid { u8 mac_count; /* 0x40 Number of MAC addresses */ u8 mac_flag; /* 0x41 MAC table flags */ u8 mac[MAX_NUM_PORTS][6]; /* 0x42 - 0xa1 MAC addresses */ - u8 res_2[90]; /* 0xa2 - 0xfb Reserved */ + u8 res_2[90]; /* 0xa2 - 0xfb Reserved */ u32 crc; /* 0xfc - 0xff CRC32 checksum */ } __packed; diff --git a/arch/arm/boards/ls1046ardb/lowlevel.c b/arch/arm/boards/ls1046ardb/lowlevel.c index 055e5f4c99..408e6017f6 100644 --- a/arch/arm/boards/ls1046ardb/lowlevel.c +++ b/arch/arm/boards/ls1046ardb/lowlevel.c @@ -12,10 +12,10 @@ #include <asm/barebox-arm.h> #include <asm/syscounter.h> #include <asm/cache.h> -#include <mach/errata.h> -#include <mach/lowlevel.h> -#include <mach/xload.h> -#include <mach/layerscape.h> +#include <mach/layerscape/errata.h> +#include <mach/layerscape/lowlevel.h> +#include <mach/layerscape/xload.h> +#include <mach/layerscape/layerscape.h> struct board_specific_parameters { u32 n_ranks; @@ -147,7 +147,7 @@ found: popts->cpo_sample = 0x61; } -extern char __dtb_fsl_ls1046a_rdb_start[]; +extern char __dtb_z_fsl_ls1046a_rdb_start[]; static struct spd_eeprom spd_eeprom[] = { { @@ -195,23 +195,21 @@ static noinline __noreturn void ls1046ardb_r_entry(unsigned long memsize) memsize = 0x100000000 - membase; barebox_arm_entry(membase, 0x80000000 - SZ_64M, - __dtb_fsl_ls1046a_rdb_start); + __dtb_z_fsl_ls1046a_rdb_start); } arm_cpu_lowlevel_init(); - debug_ll_init(); + ls1046a_debug_ll_init(); ls1046a_init_lowlevel(); - IMD_USED_OF(fsl_ls1046a_rdb); - i2c = ls1046_i2c_init(IOMEM(LSCH2_I2C1_BASE_ADDR)); - ret = spd_read_eeprom(i2c, 0x51, &spd_eeprom); + ret = spd_read_eeprom(i2c, 0x51, &spd_eeprom, SPD_MEMTYPE_DDR4); if (ret) { pr_err("Cannot read SPD EEPROM: %d\n", ret); goto err; } - memsize = fsl_ddr_sdram(&ls1046a_info); + memsize = fsl_ddr_sdram(&ls1046a_info, false); ls1046a_errata_post_ddr(); |