summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2014-05-22 12:02:36 +1000
committerNathan Rossi <nathan.rossi@xilinx.com>2014-05-22 12:02:36 +1000
commitf8e19b07eddbebb0218849957edbb154c2d6ad3f (patch)
tree28c287caaf5ee8ca364a0bdcc0f1cede3ca8b4af
parent8976e85626936dc3ec7cbb10f3f17ec09ee1876d (diff)
downloadmeta-xilinx-f8e19b07eddbebb0218849957edbb154c2d6ad3f.tar.gz
u-boot-xlnx: Remove older versions
* Remove 2013.01 and 2013.07, these versions have been superseded by 2014.01 * Clean up and remove any unused patches Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
Diffstat
-rw-r--r--recipes-bsp/u-boot/u-boot-xlnx.inc2
-rw-r--r--recipes-bsp/u-boot/u-boot-xlnx/microblaze_Fix_coding_style_for_bootb.patch114
-rw-r--r--recipes-bsp/u-boot/u-boot-xlnx/microblaze_bootm_Add_support_for_loading_initrd.patch32
-rw-r--r--recipes-bsp/u-boot/u-boot-xlnx/microblaze_bootm_Fix_coding_style_issues.patch70
-rw-r--r--recipes-bsp/u-boot/u-boot-xlnx/zynq-Increase-number-of-arguments.patch29
-rw-r--r--recipes-bsp/u-boot/u-boot-xlnx/zynq_common-Add-uEnv.txt-boot-environment-load-suppo.patch72
-rw-r--r--recipes-bsp/u-boot/u-boot-xlnx_2013.01.bb17
-rw-r--r--recipes-bsp/u-boot/u-boot-xlnx_2013.07.bb12
8 files changed, 0 insertions, 348 deletions
diff --git a/recipes-bsp/u-boot/u-boot-xlnx.inc b/recipes-bsp/u-boot/u-boot-xlnx.inc
index 03052ddf..ee6b32c2 100644
--- a/recipes-bsp/u-boot/u-boot-xlnx.inc
+++ b/recipes-bsp/u-boot/u-boot-xlnx.inc
@@ -1,7 +1,6 @@
1require recipes-bsp/u-boot/u-boot.inc 1require recipes-bsp/u-boot/u-boot.inc
2 2
3LICENSE = "GPLv2+" 3LICENSE = "GPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
5 4
6XILINX_EXTENSION = "-xilinx" 5XILINX_EXTENSION = "-xilinx"
7 6
@@ -9,4 +8,3 @@ FILESEXTRAPATHS += "${THISDIR}/u-boot-xlnx:"
9SRC_URI = "git://github.com/Xilinx/u-boot-xlnx.git;protocol=https" 8SRC_URI = "git://github.com/Xilinx/u-boot-xlnx.git;protocol=https"
10 9
11include u-boot-extra.inc 10include u-boot-extra.inc
12
diff --git a/recipes-bsp/u-boot/u-boot-xlnx/microblaze_Fix_coding_style_for_bootb.patch b/recipes-bsp/u-boot/u-boot-xlnx/microblaze_Fix_coding_style_for_bootb.patch
deleted file mode 100644
index 09648c10..00000000
--- a/recipes-bsp/u-boot/u-boot-xlnx/microblaze_Fix_coding_style_for_bootb.patch
+++ /dev/null
@@ -1,114 +0,0 @@
1From: Michal Simek <michal.simek@xilinx.com>
2Subject: [U-BOOT PATCH 1/3] microblaze: Fix coding style for bootb
3
4Fix this weird untested code to be able to other changes.
5
6Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7---
8 arch/microblaze/lib/bootm.c | 81 ++++++++++++++++++++++++---------------------
9 1 file changed, 43 insertions(+), 38 deletions(-)
10
11diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c
12index 7da683d..6c4fa60 100644
13--- a/arch/microblaze/lib/bootm.c
14+++ b/arch/microblaze/lib/bootm.c
15@@ -91,52 +91,57 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
16 #if defined(CONFIG_CMD_BOOTB)
17 int do_bootb_kintex7(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
18 {
19- u32 FrameBuffer[8];
20- u32 BootAddress = simple_strtoul(argv[1], NULL, 16);
21- u32 Index = 0;
22- u32 Count;
23-
24- if (argc < 2)
25+ u32 framebuffer[8];
26+ u32 bootaddress = simple_strtoul(argv[1], NULL, 16);
27+ u32 index = 0;
28+ u32 count;
29+
30+ if (argc < 2)
31+ return -1;
32+
33+ if ((bootaddress < CONFIG_SYS_FLASH_BASE) ||
34+ (bootaddress > (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE)))
35 return -1;
36-
37- if ((BootAddress < CONFIG_SYS_FLASH_BASE) || (BootAddress > (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE)))
38- {
39- return -1;
40- }
41
42- /*
43+ /*
44 * Create the data to be written to the ICAP.
45 */
46- FrameBuffer[Index++] = XHI_DUMMY_PACKET;
47- FrameBuffer[Index++] = XHI_SYNC_PACKET;
48- FrameBuffer[Index++] = XHI_NOOP_PACKET;
49- FrameBuffer[Index++] = 0x30020001; /* Type 1 write to WBSTAR */
50- FrameBuffer[Index++] = BootAddress;
51- FrameBuffer[Index++] = 0x30008001; /* Type 1 Write to CMD */
52- FrameBuffer[Index++] = XHI_CMD_IPROG;
53- FrameBuffer[Index++] = XHI_NOOP_PACKET;
54-
55- /*
56- * Fill the FIFO with as many words as it will take (or as many as we have to send).
57- */
58- while(Index > XHwIcap_GetWrFifoVacancy(HWICAP_BASEADDR));
59- for (Count = 0; Count < Index; Count++)
60- {
61- XHwIcap_FifoWrite(HWICAP_BASEADDR, FrameBuffer[Count]);
62- }
63-
64- /*
65+ framebuffer[index++] = XHI_DUMMY_PACKET;
66+ framebuffer[index++] = XHI_SYNC_PACKET;
67+ framebuffer[index++] = XHI_NOOP_PACKET;
68+ framebuffer[index++] = 0x30020001; /* Type 1 write to WBSTAR */
69+ framebuffer[index++] = bootaddress;
70+ framebuffer[index++] = 0x30008001; /* Type 1 Write to CMD */
71+ framebuffer[index++] = XHI_CMD_IPROG;
72+ framebuffer[index++] = XHI_NOOP_PACKET;
73+
74+ /*
75+ * Fill the FIFO with as many words as it will take
76+ * (or as many as we have to send).
77+ */
78+ while (index > XHwIcap_GetWrFifoVacancy(HWICAP_BASEADDR))
79+ ;
80+ for (count = 0; count < index; count++)
81+ XHwIcap_FifoWrite(HWICAP_BASEADDR, framebuffer[count]);
82+
83+
84+ /*
85 * Start the transfer of the data from the FIFO to the ICAP device.
86 */
87 XHwIcap_StartConfig(HWICAP_BASEADDR);
88
89- while ((XHwIcap_ReadReg(HWICAP_BASEADDR,XHI_CR_OFFSET)) & XHI_CR_WRITE_MASK);
90-
91- while (XHwIcap_IsDeviceBusy(HWICAP_BASEADDR) != 0);
92- while (XHwIcap_ReadReg(HWICAP_BASEADDR, XHI_CR_OFFSET) & XHI_CR_WRITE_MASK);
93-
94- /* The code should never get here sice the FPGA should reset */
95- return -1;
96+ while ((XHwIcap_ReadReg(HWICAP_BASEADDR, XHI_CR_OFFSET)) &
97+ XHI_CR_WRITE_MASK)
98+ ;
99+
100+ while (XHwIcap_IsDeviceBusy(HWICAP_BASEADDR) != 0)
101+ ;
102+ while (XHwIcap_ReadReg(HWICAP_BASEADDR, XHI_CR_OFFSET) &
103+ XHI_CR_WRITE_MASK)
104+ ;
105+
106+ /* The code should never get here sice the FPGA should reset */
107+ return -1;
108 }
109
110 U_BOOT_CMD(
111--
1121.8.2.1
113
114
diff --git a/recipes-bsp/u-boot/u-boot-xlnx/microblaze_bootm_Add_support_for_loading_initrd.patch b/recipes-bsp/u-boot/u-boot-xlnx/microblaze_bootm_Add_support_for_loading_initrd.patch
deleted file mode 100644
index 88c44687..00000000
--- a/recipes-bsp/u-boot/u-boot-xlnx/microblaze_bootm_Add_support_for_loading_initrd.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From: Michal Simek <michal.simek@xilinx.com>
2Subject: [U-BOOT PATCH 3/3] microblaze: bootm: Add support for loading
3 initrd
4
5fdt_initrd add additional information to DTB about initrd
6addresses which are later used by kernel.
7
8Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9---
10 arch/microblaze/lib/bootm.c | 5 +++++
11 1 file changed, 5 insertions(+)
12
13diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c
14index 56a1568..fbb43b8 100644
15--- a/arch/microblaze/lib/bootm.c
16+++ b/arch/microblaze/lib/bootm.c
17@@ -68,6 +68,11 @@ int do_bootm_linux(int flag, int argc, char * const argv[],
18
19 if (!of_flat_tree && argc > 3)
20 of_flat_tree = (char *)simple_strtoul(argv[3], NULL, 16);
21+
22+ /* fixup the initrd now that we know where it should be */
23+ if (images->rd_start && images->rd_end && of_flat_tree)
24+ fdt_initrd(of_flat_tree, images->rd_start, images->rd_end, 1);
25+
26 #ifdef DEBUG
27 printf("## Transferring control to Linux (at address 0x%08lx) ",
28 (ulong)thekernel);
29--
301.8.2.1
31
32
diff --git a/recipes-bsp/u-boot/u-boot-xlnx/microblaze_bootm_Fix_coding_style_issues.patch b/recipes-bsp/u-boot/u-boot-xlnx/microblaze_bootm_Fix_coding_style_issues.patch
deleted file mode 100644
index 1352d828..00000000
--- a/recipes-bsp/u-boot/u-boot-xlnx/microblaze_bootm_Fix_coding_style_issues.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From: Michal Simek <michal.simek@xilinx.com>
2Subject: [U-BOOT PATCH 2/3] microblaze: bootm: Fix coding style issues
3
4Prepare place for new patch.
5
6Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7---
8 arch/microblaze/lib/bootm.c | 20 +++++++++++---------
9 1 file changed, 11 insertions(+), 9 deletions(-)
10
11diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c
12index 6c4fa60..56a1568 100644
13--- a/arch/microblaze/lib/bootm.c
14+++ b/arch/microblaze/lib/bootm.c
15@@ -36,11 +36,12 @@
16
17 DECLARE_GLOBAL_DATA_PTR;
18
19-int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *images)
20+int do_bootm_linux(int flag, int argc, char * const argv[],
21+ bootm_headers_t *images)
22 {
23 /* First parameter is mapped to $r5 for kernel boot args */
24- void (*theKernel) (char *, ulong, ulong);
25- char *commandline = getenv ("bootargs");
26+ void (*thekernel) (char *, ulong, ulong);
27+ char *commandline = getenv("bootargs");
28 ulong rd_data_start, rd_data_end;
29
30 if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
31@@ -55,10 +56,10 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
32 of_flat_tree = images->ft_addr;
33 #endif
34
35- theKernel = (void (*)(char *, ulong, ulong))images->ep;
36+ thekernel = (void (*)(char *, ulong, ulong))images->ep;
37
38 /* find ramdisk */
39- ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_MICROBLAZE,
40+ ret = boot_get_ramdisk(argc, argv, images, IH_ARCH_MICROBLAZE,
41 &rd_data_start, &rd_data_end);
42 if (ret)
43 return 1;
44@@ -68,9 +69,10 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
45 if (!of_flat_tree && argc > 3)
46 of_flat_tree = (char *)simple_strtoul(argv[3], NULL, 16);
47 #ifdef DEBUG
48- printf ("## Transferring control to Linux (at address 0x%08lx) " \
49- "ramdisk 0x%08lx, FDT 0x%08lx...\n",
50- (ulong) theKernel, rd_data_start, (ulong) of_flat_tree);
51+ printf("## Transferring control to Linux (at address 0x%08lx) ",
52+ (ulong)thekernel);
53+ printf("ramdisk 0x%08lx, FDT 0x%08lx...\n",
54+ rd_data_start, (ulong) of_flat_tree);
55 #endif
56
57 #ifdef XILINX_USE_DCACHE
58@@ -82,7 +84,7 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
59 * r6: pointer to ramdisk
60 * r7: pointer to the fdt, followed by the board info data
61 */
62- theKernel (commandline, rd_data_start, (ulong) of_flat_tree);
63+ thekernel(commandline, rd_data_start, (ulong)of_flat_tree);
64 /* does not return */
65
66 return 1;
67--
681.8.2.1
69
70
diff --git a/recipes-bsp/u-boot/u-boot-xlnx/zynq-Increase-number-of-arguments.patch b/recipes-bsp/u-boot/u-boot-xlnx/zynq-Increase-number-of-arguments.patch
deleted file mode 100644
index 22c9fb67..00000000
--- a/recipes-bsp/u-boot/u-boot-xlnx/zynq-Increase-number-of-arguments.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From: Michal Simek <michal.simek@xilinx.com>
2Date: Wed, 4 Sep 2013 08:59:37 +0200
3Subject: [PATCH] zynq: Increase number of arguments
4
5The main reason is that with adding option to load
6variables from SD user can create longer user commands.
7
8Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9Upstream-Status: Backport
10---
11 include/configs/zynq_common.h | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h
15index a7cadc4..e83c6de 100644
16--- a/include/configs/zynq_common.h
17+++ b/include/configs/zynq_common.h
18@@ -105,7 +105,7 @@
19 #define CONFIG_AUTO_COMPLETE
20 #define CONFIG_SYS_LONGHELP
21 #define CONFIG_BOARD_LATE_INIT
22-#define CONFIG_SYS_MAXARGS 16
23+#define CONFIG_SYS_MAXARGS 32
24 #define CONFIG_SYS_CBSIZE 2048
25 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
26 sizeof(CONFIG_SYS_PROMPT) + 16)
27--
281.7.9.5
29
diff --git a/recipes-bsp/u-boot/u-boot-xlnx/zynq_common-Add-uEnv.txt-boot-environment-load-suppo.patch b/recipes-bsp/u-boot/u-boot-xlnx/zynq_common-Add-uEnv.txt-boot-environment-load-suppo.patch
deleted file mode 100644
index d0c3d3e6..00000000
--- a/recipes-bsp/u-boot/u-boot-xlnx/zynq_common-Add-uEnv.txt-boot-environment-load-suppo.patch
+++ /dev/null
@@ -1,72 +0,0 @@
1From: Nathan Rossi <nathan.rossi@xilinx.com>
2Date: Fri, 30 Aug 2013 16:13:15 +1000
3Subject: [PATCH] zynq_common: Add uEnv.txt boot environment load support
4
5Add support for using a uEnv.txt file for loading and or modifying the
6existing boot environment during a Zynq "sdboot". If the environment
7fails to load during the "sdboot" continue booting from SD normally.
8
9This uEnv.txt and bootenv/uenv default environment variables are based
10on the implementation used in omap3_beagle.h.
11
12Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
13Signed-off-by: Michal Simek <michal.simek@xilinx.com>
14Upstream-Status: Backport
15---
16 include/configs/zynq_common.h | 28 ++++++++++++++++++++++------
17 1 file changed, 22 insertions(+), 6 deletions(-)
18
19diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h
20index 762aaca..a7cadc4 100644
21--- a/include/configs/zynq_common.h
22+++ b/include/configs/zynq_common.h
23@@ -237,11 +237,16 @@
24 "devicetree_image=devicetree.dtb\0" \
25 "bitstream_image=system.bit.bin\0" \
26 "loadbit_addr=0x100000\0" \
27+ "loadbootenv_addr=0x2000000\0" \
28 "kernel_size=0x500000\0" \
29 "devicetree_size=0x20000\0" \
30 "ramdisk_size=0x5E0000\0" \
31 "fdt_high=0x20000000\0" \
32 "initrd_high=0x20000000\0" \
33+ "bootenv=uEnv.txt\0" \
34+ "loadbootenv=fatload mmc 0 ${loadbootenv_addr} ${bootenv}\0" \
35+ "importbootenv=echo Importing environment from SD ...; " \
36+ "env import -t ${loadbootenv_addr} $filesize\0" \
37 "mmc_loadbit_fat=echo Loading bitstream from SD/MMC/eMMC to RAM.. && " \
38 "mmcinfo && " \
39 "fatload mmc 0 ${loadbit_addr} ${bitstream_image} && " \
40@@ -259,12 +264,23 @@
41 "echo Copying ramdisk... && " \
42 "sf read 0x2000000 0x620000 ${ramdisk_size} && " \
43 "bootm 0x3000000 0x2000000 0x2A00000\0" \
44- "sdboot=echo Copying Linux from SD to RAM... && " \
45- "mmcinfo && " \
46- "fatload mmc 0 0x3000000 ${kernel_image} && " \
47- "fatload mmc 0 0x2A00000 ${devicetree_image} && " \
48- "fatload mmc 0 0x2000000 ${ramdisk_image} && " \
49- "bootm 0x3000000 0x2000000 0x2A00000\0" \
50+ "uenvboot=" \
51+ "if run loadbootenv; then " \
52+ "echo Loaded environment from ${bootenv}; " \
53+ "run importbootenv; " \
54+ "fi; " \
55+ "if test -n $uenvcmd; then " \
56+ "echo Running uenvcmd ...; " \
57+ "run uenvcmd; " \
58+ "fi\0" \
59+ "sdboot=if mmcinfo; then " \
60+ "run uenvboot; " \
61+ "echo Copying Linux from SD to RAM... && " \
62+ "fatload mmc 0 0x3000000 ${kernel_image} && " \
63+ "fatload mmc 0 0x2A00000 ${devicetree_image} && " \
64+ "fatload mmc 0 0x2000000 ${ramdisk_image} && " \
65+ "bootm 0x3000000 0x2000000 0x2A00000; " \
66+ "fi\0" \
67 "nandboot=echo Copying Linux from NAND flash to RAM... && " \
68 "nand read 0x3000000 0x100000 ${kernel_size} && " \
69 "nand read 0x2A00000 0x600000 ${devicetree_size} && " \
70--
711.7.9.5
72
diff --git a/recipes-bsp/u-boot/u-boot-xlnx_2013.01.bb b/recipes-bsp/u-boot/u-boot-xlnx_2013.01.bb
deleted file mode 100644
index 2d302e33..00000000
--- a/recipes-bsp/u-boot/u-boot-xlnx_2013.01.bb
+++ /dev/null
@@ -1,17 +0,0 @@
1
2# We use the revision in order to avoid having to fetch it from the
3# repo during parse
4# Corresponds to xilinx-v14.5 tag
5SRCREV = "20a6cdd301941b97961c9c5425b5fbb771321aac"
6PV = "v2013.01${XILINX_EXTENSION}+git${SRCPV}"
7PR = "r1"
8
9include u-boot-xlnx.inc
10
11SRC_URI_append += " \
12 file://microblaze_bootm_Add_support_for_loading_initrd.patch \
13 file://microblaze_bootm_Fix_coding_style_issues.patch \
14 file://microblaze_Fix_coding_style_for_bootb.patch \
15 file://zynq_common-Add-uEnv.txt-boot-environment-load-suppo.patch \
16 file://zynq-Increase-number-of-arguments.patch \
17 "
diff --git a/recipes-bsp/u-boot/u-boot-xlnx_2013.07.bb b/recipes-bsp/u-boot/u-boot-xlnx_2013.07.bb
deleted file mode 100644
index 8ec99eb0..00000000
--- a/recipes-bsp/u-boot/u-boot-xlnx_2013.07.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1# Revision corresponds to commit after 2013.07 merge
2# in u-boot-xlnx.git
3SRCREV = "f40924452f947fbd6886eaa677c1b0bd47edfcf5"
4PV = "v2013.07${XILINX_EXTENSION}+git${SRCPV}"
5PR = "r1"
6
7include u-boot-xlnx.inc
8
9SRC_URI_append += " \
10 file://zynq_common-Add-uEnv.txt-boot-environment-load-suppo.patch \
11 file://zynq-Increase-number-of-arguments.patch \
12 "
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-08 21:32:19 +0000