summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/configs/ls1028ardb.h4
-rw-r--r--include/configs/ls1043a_common.h2
-rw-r--r--include/configs/ls1043aqds.h5
-rw-r--r--include/configs/ls1043ardb.h10
-rw-r--r--include/configs/ls1046a_common.h2
-rw-r--r--include/configs/ls1046afrwy.h6
-rw-r--r--include/configs/ls1046aqds.h5
-rw-r--r--include/configs/ls1046ardb.h10
-rw-r--r--include/configs/lx2160a_common.h2
-rw-r--r--include/configs/lx2160ardb.h5
-rw-r--r--include/scsi.h5
11 files changed, 53 insertions, 3 deletions
diff --git a/include/configs/ls1028ardb.h b/include/configs/ls1028ardb.h
index 9c869ee6840..613abc50567 100644
--- a/include/configs/ls1028ardb.h
+++ b/include/configs/ls1028ardb.h
@@ -54,6 +54,9 @@
"board=ls1028ardb\0" \
"hwconfig=fsl_ddr:bank_intlv=auto\0" \
"fdtfile=fsl-ls1028a-rdb.dtb\0" \
+ "image=Image\0" \
+ "extra_bootargs=iommu.passthrough=1 arm-smmu.disable_bypass=0\0" \
+ "othbootargs=video=1920x1080-32@60 cma=640M\0" \
"ramdisk_addr=0x800000\0" \
"ramdisk_size=0x2000000\0" \
"bootm_size=0x10000000\0" \
@@ -76,6 +79,7 @@
"kernelhdr_addr_sd=0x3000\0" \
"kernelhdr_size_sd=0x20\0" \
"console=ttyS0,115200\0" \
+ "console_dbg=earlycon=uart8250,mmio,0x21c0500\0" \
BOOTENV \
"boot_scripts=ls1028ardb_boot.scr\0" \
"boot_script_hdr=hdr_ls1028ardb_bs.out\0" \
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 4c695388d2f..24a717706af 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -88,7 +88,7 @@
#include <config_distro_bootcmd.h>
/* Initial environment variables */
-#define CFG_EXTRA_ENV_SETTINGS \
+#define EXTRA_ENV_SETTINGS \
"hwconfig=fsl_ddr:bank_intlv=auto\0" \
"initrd_high=0xffffffffffffffff\0" \
"kernel_addr=0x61000000\0" \
diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
index 7ccbb20bf2e..c06e986e93f 100644
--- a/include/configs/ls1043aqds.h
+++ b/include/configs/ls1043aqds.h
@@ -295,6 +295,11 @@
/*
* Environment
*/
+#ifndef SPL_NO_MISC
+/* Initial environment variables */
+#define CFG_EXTRA_ENV_SETTINGS \
+ EXTRA_ENV_SETTINGS
+#endif
#include <asm/fsl_secure_boot.h>
diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index ef8fdc1912b..90caf8a1371 100644
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -201,4 +201,14 @@
#include <asm/fsl_secure_boot.h>
+#ifndef SPL_NO_MISC
+/* Initial environment variables */
+#define CFG_EXTRA_ENV_SETTINGS \
+ EXTRA_ENV_SETTINGS \
+ "board=ls1043ardb\0" \
+ "fdtfile=fsl-ls1043a-rdb-sdk.dtb\0" \
+ "image=Image\0" \
+ "console_dbg=earlycon=uart8250,mmio,0x21c0500\0"
+#endif
+
#endif /* __LS1043ARDB_H__ */
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 53ef5975a28..89f96bb3e74 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -83,7 +83,7 @@
#endif
#ifndef SPL_NO_MISC
/* Initial environment variables */
-#define CFG_EXTRA_ENV_SETTINGS \
+#define EXTRA_ENV_SETTINGS \
"hwconfig=fsl_ddr:bank_intlv=auto\0" \
"ramdisk_addr=0x800000\0" \
"ramdisk_size=0x2000000\0" \
diff --git a/include/configs/ls1046afrwy.h b/include/configs/ls1046afrwy.h
index 21804fc6654..07846c3bd25 100644
--- a/include/configs/ls1046afrwy.h
+++ b/include/configs/ls1046afrwy.h
@@ -70,6 +70,12 @@
/*
* Environment
*/
+#ifndef SPL_NO_MISC
+/* Initial environment variables */
+#define CFG_EXTRA_ENV_SETTINGS \
+ EXTRA_ENV_SETTINGS
+#endif
+
#define CFG_SYS_FSL_QSPI_BASE 0x40000000
#undef BOOT_TARGET_DEVICES
diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index 4b4bd7cbe48..001118b8504 100644
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -312,6 +312,11 @@
/*
* Environment
*/
+#ifndef SPL_NO_MISC
+/* Initial environment variables */
+#define CFG_EXTRA_ENV_SETTINGS \
+ EXTRA_ENV_SETTINGS
+#endif
#ifdef CONFIG_TFABOOT
#define IFC_NAND_BOOTCOMMAND "run distro_bootcmd; run nand_bootcmd; " \
diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index 0e42a51fc59..a032e52c519 100644
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -131,4 +131,14 @@
#include <asm/fsl_secure_boot.h>
+#ifndef SPL_NO_MISC
+/* Initial environment variables */
+#define CFG_EXTRA_ENV_SETTINGS \
+ EXTRA_ENV_SETTINGS \
+ "board=ls1046ardb\0" \
+ "fdtfile=fsl-ls1046a-rdb-sdk.dtb\0" \
+ "image=Image\0" \
+ "console_dbg=earlycon=uart8250,mmio,0x21c0500\0"
+#endif
+
#endif /* __LS1046ARDB_H__ */
diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index 4c1b4bf2b2c..45b5cbdd85a 100644
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -137,7 +137,7 @@
"kernelhdr_addr_sd=0x3000\0" \
"kernel_size_sd=0x14000\0" \
"kernelhdr_size_sd=0x20\0" \
- "console=ttyAMA0,38400n8\0" \
+ "console=ttyAMA0,115200\0" \
BOOTENV \
"mcmemsize=0x70000000\0" \
XSPI_MC_INIT_CMD \
diff --git a/include/configs/lx2160ardb.h b/include/configs/lx2160ardb.h
index e700a7b1135..725220c5747 100644
--- a/include/configs/lx2160ardb.h
+++ b/include/configs/lx2160ardb.h
@@ -21,6 +21,11 @@
/* Initial environment variables */
#define CFG_EXTRA_ENV_SETTINGS \
+ "board=lx2160ardb\0" \
+ "fdtfile=fsl-lx2160a-rdb.dtb\0" \
+ "image=Image\0" \
+ "extra_bootargs=pci=pcie_bus_perf\0" \
+ "console_dbg=earlycon=pl011,mmio32,0x21c0000\0" \
EXTRA_ENV_SETTINGS \
"boot_scripts=lx2160ardb_boot.scr\0" \
"boot_script_hdr=hdr_lx2160ardb_bs.out\0" \
diff --git a/include/scsi.h b/include/scsi.h
index 8d6c5116419..2520a8b8fe6 100644
--- a/include/scsi.h
+++ b/include/scsi.h
@@ -340,6 +340,7 @@ int scsi_bus_reset(struct udevice *dev);
* scsi_scan() - Scan all SCSI controllers for available devices
*
* @vebose: true to show information about each device found
+ * Return: 0 if OK, -ve on error
*/
int scsi_scan(bool verbose);
@@ -348,15 +349,19 @@ int scsi_scan(bool verbose);
*
* @dev: SCSI bus
* @verbose: true to show information about each device found
+ * Return: 0 if OK, -ve on error
*/
int scsi_scan_dev(struct udevice *dev, bool verbose);
/**
* scsi_get_blk_by_uuid() - Provides SCSI partition information.
*
+ * scsi_scan() must have been called before calling this function.
+ *
* @uuid: UUID of the partition for fetching its info
* @blk_desc_ptr: Provides the blk descriptor
* @part_info_ptr: Provides partition info
+ * Return: 0 if OK, -ve on error
*/
int scsi_get_blk_by_uuid(const char *uuid, struct blk_desc **blk_desc_ptr,
struct disk_partition *part_info_ptr);