Skip to content

GitLab

E
embeddedsw-xilinx
Commit 1123642d authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Added guards for defines

parent a02bfdb9
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 46 deletions
embeddedsw-xilinx_v2023.2-iwaveg35m.patch
View file @ 1123642d
diff -uNr embeddedsw-xilinx_v2023.2/lib/bsp/standalone/src/CMakeLists.txt embeddedsw-xilinx_v2023.2-iwaveg35m/lib/bsp/standalone/src/CMakeLists.txt
--- embeddedsw-xilinx_v2023.2/lib/bsp/standalone/src/CMakeLists.txt 2023-10-12 15:51:06.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/bsp/standalone/src/CMakeLists.txt 2025-02-06 08:53:37.000000000 +0000
@@ -9,13 +9,16 @@
find_package(Mem)
list(APPEND defs "#ifndef XMEM_CONFIG_H_\n")
list(APPEND defs "#define XMEM_CONFIG_H_\n\n")
+list(APPEND defs "#include \"xparameters.h\"\n\n")
list(LENGTH MEM_DEF_NAMES len)
math(EXPR mem_len "${len} - 1")
foreach(val RANGE ${mem_len})
list(GET MEM_DEF_NAMES ${val} MEM)
list(GET MEM_RANGES ${val} VAL)
+ list(APPEND defs "#ifndef ${MEM}\n")
list(APPEND defs "#define ${MEM} ${VAL}\n")
+ list(APPEND defs "#endif\n")
endforeach()
list(APPEND defs "\n#endif")
file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/common/xmem_config.h ${defs})
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/copy_bsp.sh embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/copy_bsp.sh diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/copy_bsp.sh embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/copy_bsp.sh
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/copy_bsp.sh 2023-10-13 02:51:06.000000000 +1100 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/copy_bsp.sh 2023-10-12 15:51:06.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/copy_bsp.sh 2025-01-21 19:54:42.545183038 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/copy_bsp.sh 2025-02-05 21:41:42.000000000 +0000
@@ -191,6 +191,7 @@ @@ -191,6 +191,7 @@
cp $WORKING_DIR/outbyte.c $BSP_DIR/libsrc/standalone/src/ cp $WORKING_DIR/outbyte.c $BSP_DIR/libsrc/standalone/src/
cp $BOARD_DIR/xcsudma_g.c $BSP_DIR/libsrc/csudma/src/ cp $BOARD_DIR/xcsudma_g.c $BSP_DIR/libsrc/csudma/src/
...@@ -10,8 +30,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/copy_bsp.sh emb ...@@ -10,8 +30,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/copy_bsp.sh emb
if [ $PROC == "a53" ]; then if [ $PROC == "a53" ]; then
cp ../misc/zcu102/a53/xipipsu_g.c $BSP_DIR/libsrc/ipipsu/src/ cp ../misc/zcu102/a53/xipipsu_g.c $BSP_DIR/libsrc/ipipsu/src/
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xipipsu_g.c embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xipipsu_g.c diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xipipsu_g.c embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xipipsu_g.c
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xipipsu_g.c 1970-01-01 10:00:00.000000000 +1000 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xipipsu_g.c 1970-01-01 00:00:00.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xipipsu_g.c 2025-01-21 19:54:48.911056372 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xipipsu_g.c 2025-02-05 21:41:42.000000000 +0000
@@ -0,0 +1,65 @@ @@ -0,0 +1,65 @@
+ +
+/******************************************************************* +/*******************************************************************
...@@ -79,8 +99,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xipips ...@@ -79,8 +99,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xipips
+ } + }
+}; +};
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xparameters.h embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xparameters.h diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xparameters.h embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xparameters.h
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xparameters.h 1970-01-01 10:00:00.000000000 +1000 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xparameters.h 1970-01-01 00:00:00.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xparameters.h 2025-01-21 19:54:48.919056213 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xparameters.h 2025-02-05 21:41:42.000000000 +0000
@@ -0,0 +1,1980 @@ @@ -0,0 +1,1980 @@
+#ifndef XPARAMETERS_H /* prevent circular inclusions */ +#ifndef XPARAMETERS_H /* prevent circular inclusions */
+#define XPARAMETERS_H /* by using protection macros */ +#define XPARAMETERS_H /* by using protection macros */
...@@ -2063,8 +2083,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xparam ...@@ -2063,8 +2083,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xparam
+#define XPAR_XILPM_ENABLED +#define XPAR_XILPM_ENABLED
+#endif /* end of protection macro */ +#endif /* end of protection macro */
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xparameters_ps.h embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xparameters_ps.h diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xparameters_ps.h embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xparameters_ps.h
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xparameters_ps.h 1970-01-01 10:00:00.000000000 +1000 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xparameters_ps.h 1970-01-01 00:00:00.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xparameters_ps.h 2025-01-21 19:54:48.922056153 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xparameters_ps.h 2025-02-05 21:41:42.000000000 +0000
@@ -0,0 +1,381 @@ @@ -0,0 +1,381 @@
+/****************************************************************************** +/******************************************************************************
+* Copyright (c) 2014 - 2021 Xilinx, Inc. All rights reserved. +* Copyright (c) 2014 - 2021 Xilinx, Inc. All rights reserved.
...@@ -2448,8 +2468,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xparam ...@@ -2448,8 +2468,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/a53/xparam
+ +
+#endif /* protection macro */ +#endif /* protection macro */
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/drivers.txt embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/drivers.txt diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/drivers.txt embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/drivers.txt
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/drivers.txt 1970-01-01 10:00:00.000000000 +1000 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/drivers.txt 1970-01-01 00:00:00.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/drivers.txt 2025-01-21 19:54:48.925056094 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/drivers.txt 2025-02-05 21:41:42.000000000 +0000
@@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
+canps +canps
+coresightps_dcc +coresightps_dcc
...@@ -2469,8 +2489,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/drivers.tx ...@@ -2469,8 +2489,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/drivers.tx
+ipipsu +ipipsu
+usbpsu +usbpsu
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/pm_cfg_obj.c embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/pm_cfg_obj.c diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/pm_cfg_obj.c embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/pm_cfg_obj.c
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/pm_cfg_obj.c 1970-01-01 10:00:00.000000000 +1000 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/pm_cfg_obj.c 1970-01-01 00:00:00.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/pm_cfg_obj.c 2025-01-21 19:57:06.998309312 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/pm_cfg_obj.c 2025-02-05 21:41:42.000000000 +0000
@@ -0,0 +1,591 @@ @@ -0,0 +1,591 @@
+/****************************************************************************** +/******************************************************************************
+* Copyright (c) 2017 - 2022 Xilinx, Inc. All rights reserved. +* Copyright (c) 2017 - 2022 Xilinx, Inc. All rights reserved.
...@@ -3064,8 +3084,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/pm_cfg_obj ...@@ -3064,8 +3084,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/pm_cfg_obj
+#pragma language=restore +#pragma language=restore
+#endif +#endif
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init.c embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init.c diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init.c embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init.c
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init.c 1970-01-01 10:00:00.000000000 +1000 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init.c 1970-01-01 00:00:00.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init.c 2025-01-21 19:54:48.960055397 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init.c 2025-02-05 21:41:42.000000000 +0000
@@ -0,0 +1,21155 @@ @@ -0,0 +1,21155 @@
+/****************************************************************************** +/******************************************************************************
+* +*
...@@ -24223,8 +24243,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init.c ...@@ -24223,8 +24243,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init.c
+ +
+ +
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init_gpl.c embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init_gpl.c diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init_gpl.c embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init_gpl.c
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init_gpl.c 1970-01-01 10:00:00.000000000 +1000 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init_gpl.c 1970-01-01 00:00:00.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init_gpl.c 2025-01-21 19:54:48.969055218 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init_gpl.c 2025-02-05 21:41:42.000000000 +0000
@@ -0,0 +1,21162 @@ @@ -0,0 +1,21162 @@
+/****************************************************************************** +/******************************************************************************
+* +*
...@@ -45389,8 +45409,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init_g ...@@ -45389,8 +45409,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init_g
+ +
+ +
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init_gpl.h embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init_gpl.h diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init_gpl.h embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init_gpl.h
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init_gpl.h 1970-01-01 10:00:00.000000000 +1000 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init_gpl.h 1970-01-01 00:00:00.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init_gpl.h 2025-01-21 19:54:48.982054959 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init_gpl.h 2025-02-05 21:41:42.000000000 +0000
@@ -0,0 +1,35433 @@ @@ -0,0 +1,35433 @@
+/****************************************************************************** +/******************************************************************************
+* +*
...@@ -80826,8 +80846,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init_g ...@@ -80826,8 +80846,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init_g
+} +}
+#endif +#endif
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init.h embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init.h diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init.h embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init.h
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init.h 1970-01-01 10:00:00.000000000 +1000 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init.h 1970-01-01 00:00:00.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init.h 2025-01-21 19:54:48.994054720 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init.h 2025-02-05 21:41:42.000000000 +0000
@@ -0,0 +1,35419 @@ @@ -0,0 +1,35419 @@
+/****************************************************************************** +/******************************************************************************
+* +*
...@@ -116249,8 +116269,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init.h ...@@ -116249,8 +116269,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/psu_init.h
+} +}
+#endif +#endif
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xipipsu_g.c embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xipipsu_g.c diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xipipsu_g.c embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xipipsu_g.c
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xipipsu_g.c 1970-01-01 10:00:00.000000000 +1000 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xipipsu_g.c 1970-01-01 00:00:00.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xipipsu_g.c 2025-01-21 19:54:48.996054680 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xipipsu_g.c 2025-02-05 21:41:42.000000000 +0000
@@ -0,0 +1,65 @@ @@ -0,0 +1,65 @@
+ +
+/******************************************************************* +/*******************************************************************
...@@ -116318,8 +116338,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xipipsu ...@@ -116318,8 +116338,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xipipsu
+ } + }
+}; +};
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xparameters.h embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xparameters.h diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xparameters.h embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xparameters.h
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xparameters.h 1970-01-01 10:00:00.000000000 +1000 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xparameters.h 1970-01-01 00:00:00.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xparameters.h 2025-01-21 19:54:48.997054660 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xparameters.h 2025-02-05 21:41:42.000000000 +0000
@@ -0,0 +1,1682 @@ @@ -0,0 +1,1682 @@
+/****************************************************************************** +/******************************************************************************
+* Copyright (c) 2021 - 2022 Xilinx, Inc. All rights reserved. +* Copyright (c) 2021 - 2022 Xilinx, Inc. All rights reserved.
...@@ -118004,8 +118024,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xparame ...@@ -118004,8 +118024,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xparame
+#define XPAR_XILPM_ENABLED +#define XPAR_XILPM_ENABLED
+#endif /* end of protection macro */ +#endif /* end of protection macro */
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xparameters_ps.h embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xparameters_ps.h diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xparameters_ps.h embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xparameters_ps.h
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xparameters_ps.h 1970-01-01 10:00:00.000000000 +1000 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xparameters_ps.h 1970-01-01 00:00:00.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xparameters_ps.h 2025-01-21 19:54:48.997054660 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xparameters_ps.h 2025-02-05 21:41:42.000000000 +0000
@@ -0,0 +1,392 @@ @@ -0,0 +1,392 @@
+/****************************************************************************** +/******************************************************************************
+* Copyright (c) 2014 - 2021 Xilinx, Inc. All rights reserved. +* Copyright (c) 2014 - 2021 Xilinx, Inc. All rights reserved.
...@@ -118400,8 +118420,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xparame ...@@ -118400,8 +118420,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/r5/xparame
+* @} End of "addtogroup r5_peripheral_definitions". +* @} End of "addtogroup r5_peripheral_definitions".
+*/ +*/
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/xcsudma_g.c embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/xcsudma_g.c diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/xcsudma_g.c embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/xcsudma_g.c
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/xcsudma_g.c 1970-01-01 10:00:00.000000000 +1000 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/xcsudma_g.c 1970-01-01 00:00:00.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/xcsudma_g.c 2025-01-21 19:54:48.998054640 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/xcsudma_g.c 2025-02-05 21:41:42.000000000 +0000
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
+ +
+/******************************************************************* +/*******************************************************************
...@@ -118434,8 +118454,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/xcsudma_g. ...@@ -118434,8 +118454,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/xcsudma_g.
+ } + }
+}; +};
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/xsdps_g.c embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/xsdps_g.c diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/xsdps_g.c embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/xsdps_g.c
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/xsdps_g.c 1970-01-01 10:00:00.000000000 +1000 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/xsdps_g.c 1970-01-01 00:00:00.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/xsdps_g.c 2025-01-21 19:54:48.998054640 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/xsdps_g.c 2025-02-05 21:41:42.000000000 +0000
@@ -0,0 +1,78 @@ @@ -0,0 +1,78 @@
+/****************************************************************************** +/******************************************************************************
+* Copyright (C) 2013 - 2022 Xilinx, Inc. All rights reserved. +* Copyright (C) 2013 - 2022 Xilinx, Inc. All rights reserved.
...@@ -118516,8 +118536,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/xsdps_g.c ...@@ -118516,8 +118536,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/xsdps_g.c
+}; +};
+/** @} */ +/** @} */
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/xusbpsu_g.c embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/xusbpsu_g.c diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/xusbpsu_g.c embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/xusbpsu_g.c
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/xusbpsu_g.c 1970-01-01 10:00:00.000000000 +1000 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/xusbpsu_g.c 1970-01-01 00:00:00.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/xusbpsu_g.c 2025-01-21 19:54:48.998054640 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/misc/g35m/xusbpsu_g.c 2025-02-05 21:41:42.000000000 +0000
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
+ +
+/******************************************************************* +/*******************************************************************
...@@ -118551,8 +118571,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/xusbpsu_g. ...@@ -118551,8 +118571,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/misc/g35m/xusbpsu_g.
+ } + }
+}; +};
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/si5341b-cs1-reg.h embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/src/si5341b-cs1-reg.h diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/si5341b-cs1-reg.h embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/src/si5341b-cs1-reg.h
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/si5341b-cs1-reg.h 1970-01-01 10:00:00.000000000 +1000 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/si5341b-cs1-reg.h 1970-01-01 00:00:00.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/src/si5341b-cs1-reg.h 2025-01-21 19:54:48.998054640 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/src/si5341b-cs1-reg.h 2025-02-05 21:41:42.000000000 +0000
@@ -0,0 +1,949 @@ @@ -0,0 +1,949 @@
+/* +/*
+ * Si5341 Rev D Configuration Register Export Header File + * Si5341 Rev D Configuration Register Export Header File
...@@ -119504,8 +119524,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/si5341b-cs1-reg. ...@@ -119504,8 +119524,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/si5341b-cs1-reg.
+ +
+#endif +#endif
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/si5341b-cs2-reg.h embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/src/si5341b-cs2-reg.h diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/si5341b-cs2-reg.h embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/src/si5341b-cs2-reg.h
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/si5341b-cs2-reg.h 1970-01-01 10:00:00.000000000 +1000 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/si5341b-cs2-reg.h 1970-01-01 00:00:00.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/src/si5341b-cs2-reg.h 2025-01-21 19:54:48.999054621 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/src/si5341b-cs2-reg.h 2025-02-05 21:41:42.000000000 +0000
@@ -0,0 +1,946 @@ @@ -0,0 +1,946 @@
+/* +/*
+ * Si5341 Rev D Configuration Register Export Header File + * Si5341 Rev D Configuration Register Export Header File
...@@ -120454,8 +120474,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/si5341b-cs2-reg. ...@@ -120454,8 +120474,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/si5341b-cs2-reg.
+ +
+#endif +#endif
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/xfsbl_board.c embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/src/xfsbl_board.c diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/xfsbl_board.c embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/src/xfsbl_board.c
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/xfsbl_board.c 2023-10-13 02:51:06.000000000 +1100 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/xfsbl_board.c 2023-10-12 15:51:06.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/src/xfsbl_board.c 2025-01-21 19:54:49.000054601 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/src/xfsbl_board.c 2025-02-05 21:41:42.000000000 +0000
@@ -37,6 +37,15 @@ @@ -37,6 +37,15 @@
******************************************************************************/ ******************************************************************************/
/***************************** Include Files *********************************/ /***************************** Include Files *********************************/
...@@ -120835,8 +120855,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/xfsbl_board.c em ...@@ -120835,8 +120855,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/xfsbl_board.c em
/** /**
* This function does board specific initialization. * This function does board specific initialization.
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hooks.c embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hooks.c diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hooks.c embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hooks.c
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hooks.c 2023-10-13 02:51:06.000000000 +1100 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hooks.c 2023-10-12 15:51:06.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hooks.c 2025-01-21 19:54:51.255009731 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hooks.c 2025-02-05 21:41:42.000000000 +0000
@@ -62,10 +62,43 @@ @@ -62,10 +62,43 @@
u32 XFsbl_HookAfterBSDownload(void ) u32 XFsbl_HookAfterBSDownload(void )
{ {
...@@ -120882,8 +120902,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hooks.c em ...@@ -120882,8 +120902,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hooks.c em
return Status; return Status;
} }
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_pmufw/misc/Makefile embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_pmufw/misc/Makefile diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_pmufw/misc/Makefile embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_pmufw/misc/Makefile
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_pmufw/misc/Makefile 2023-10-13 02:51:06.000000000 +1100 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_pmufw/misc/Makefile 2023-10-12 15:51:06.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_pmufw/misc/Makefile 2025-01-21 19:54:51.255009731 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_pmufw/misc/Makefile 2025-02-05 21:41:42.000000000 +0000
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
# Makefile generated by Xilinx. # Makefile generated by Xilinx.
-COMPILER := mb-gcc -COMPILER := mb-gcc
...@@ -120894,8 +120914,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_pmufw/misc/Makefile embed ...@@ -120894,8 +120914,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_pmufw/misc/Makefile embed
DRIVER_LIB_VERSION = 1.0 DRIVER_LIB_VERSION = 1.0
PROCESSOR = psu_pmu_0 PROCESSOR = psu_pmu_0
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_pmufw/misc/xparameters.h embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_pmufw/misc/xparameters.h diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_pmufw/misc/xparameters.h embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_pmufw/misc/xparameters.h
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_pmufw/misc/xparameters.h 2023-10-13 02:51:06.000000000 +1100 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_pmufw/misc/xparameters.h 2023-10-12 15:51:06.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_pmufw/misc/xparameters.h 2025-01-21 19:54:51.255009731 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_pmufw/misc/xparameters.h 2025-02-05 21:41:42.000000000 +0000
@@ -1209,19 +1209,38 @@ @@ -1209,19 +1209,38 @@
/******************************************************************/ /******************************************************************/
...@@ -120996,8 +121016,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_pmufw/misc/xparameters.h ...@@ -120996,8 +121016,8 @@ diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_pmufw/misc/xparameters.h
/******************************************************************/ /******************************************************************/
diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_pmufw/src/Makefile embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_pmufw/src/Makefile diff -uNr embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_pmufw/src/Makefile embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_pmufw/src/Makefile
--- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_pmufw/src/Makefile 2023-10-13 02:51:06.000000000 +1100 --- embeddedsw-xilinx_v2023.2/lib/sw_apps/zynqmp_pmufw/src/Makefile 2023-10-12 15:51:06.000000000 +0000
+++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_pmufw/src/Makefile 2025-01-21 19:54:51.257009691 +1100 +++ embeddedsw-xilinx_v2023.2-iwaveg35m/lib/sw_apps/zynqmp_pmufw/src/Makefile 2025-02-05 21:41:42.000000000 +0000
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
# Auto Generated by Xilinx generate_app. Modify at your own risk # Auto Generated by Xilinx generate_app. Modify at your own risk
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment