common: Further reduce size of common.h even more
Subsystems (51)
v2 cover common: Further reduce size of common.h even more
This series removes the remaining function declarations from common.h so that it only includes #include lines.
A final series will be needed to remove most of those #includes.
Changes in v2:
- Drop duplicate uchar in linux/types.h
Simon Glass (35):
common: Drop mdm_init()
common: Move main_loop() to init.h
common: Move flash_perror() to flash.h
common: Drop checkflash() and checkdram()
common: Move embedded fdt location to fdtdec.h
common: Move do_tftpb() to net.h
common: Move functions for loading from fat/ext2 to fs.h
common: Move relocate_code() to init.h
common: Move jumptable_init() out of common.h
common: Drop floppy disk support
common: Move reset_phy() to net.h
common: Move CONFIG_SYS_DEF_EEPROM_ADDR out of common.h
common: Drop CONFIG_POST_STD/ALT_LIST
common: Drop CONFIG_HAS_POST
common: Drop the symbol_lookup() declaration
common: Move type declarations to linux/types.h
common: Move device-tree setup functions to fdt_support.h
common: arm: Move s_init() to an ARM-specific header
common: Move ll_boot_init() to init.h
common: Move upmconfig() to ppc.h
common: Move clock functions into a new file
common: Move get_tbclk() to time.h
common: Move reset_misc() function to arch header
common: Move reset_cpu() to the CPU header
image: Rename load_addr, save_addr, save_size
common: Move the image globals into image.h
common: Rename and move source()
common: Move RAM-sizing functions to init.h
common: Move testdram() into init.h
common: Move hang() to the same header as panic()
common: Move check_member() to kernel.h
common: Move ROUND() into kernel.h
common: Move and rename CONFIG_SYS_SUPPORT_64BIT_DATA
common: Collect all the header files together
common: Update comment to show progress
Makefile | 4 +- README | 28 +- arch/arc/lib/reset.c | 1 + arch/arm/cpu/arm1136/mx35/generic.c | 1 + arch/arm/cpu/arm920t/ep93xx/cpu.c | 1 + arch/arm/cpu/arm920t/imx/timer.c | 5 +- arch/arm/cpu/arm926ejs/armada100/timer.c | 5 +- arch/arm/cpu/arm926ejs/lpc32xx/clk.c | 1 + arch/arm/cpu/arm926ejs/mx25/generic.c | 1 + arch/arm/cpu/arm926ejs/mx25/reset.c | 1 + arch/arm/cpu/arm926ejs/mx27/reset.c | 1 + arch/arm/cpu/arm926ejs/mxs/mxs.c | 2 + arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 1 + arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 1 + arch/arm/cpu/arm926ejs/spear/reset.c | 1 + arch/arm/cpu/arm926ejs/spear/spr_misc.c | 1 + arch/arm/cpu/armv7/bcm281xx/reset.c | 1 + arch/arm/cpu/armv7/bcmcygnus/reset.c | 1 + arch/arm/cpu/armv7/bcmnsp/reset.c | 1 + arch/arm/cpu/armv7/ls102xa/clock.c | 1 + arch/arm/cpu/armv7/ls102xa/fdt.c | 1 + arch/arm/cpu/armv7/stv0991/reset.c | 1 + arch/arm/cpu/armv7/vf610/generic.c | 1 + arch/arm/cpu/armv8/cache_v8.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 2 + arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 1 + .../armv8/fsl-layerscape/fsl_lsch2_speed.c | 1 + .../armv8/fsl-layerscape/fsl_lsch3_speed.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/soc.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/spl.c | 1 + arch/arm/cpu/armv8/s32v234/generic.c | 2 + arch/arm/cpu/sa1100/timer.c | 2 +- arch/arm/include/asm/armv8/mmu.h | 1 + arch/arm/include/asm/u-boot-arm.h | 4 + arch/arm/lib/bootm.c | 1 + arch/arm/lib/div0.c | 4 +- arch/arm/lib/interrupts.c | 3 +- arch/arm/lib/interrupts_m.c | 1 + arch/arm/lib/relocate_64.S | 2 +- arch/arm/lib/reset.c | 1 + arch/arm/mach-at91/arm920t/reset.c | 1 + arch/arm/mach-at91/arm926ejs/reset.c | 1 + arch/arm/mach-at91/arm926ejs/timer.c | 1 + arch/arm/mach-at91/armv7/reset.c | 1 + arch/arm/mach-at91/armv7/timer.c | 1 + arch/arm/mach-at91/spl.c | 1 + arch/arm/mach-at91/spl_at91.c | 1 + arch/arm/mach-at91/spl_atmel.c | 1 + arch/arm/mach-bcm283x/reset.c | 1 + arch/arm/mach-davinci/misc.c | 1 + arch/arm/mach-davinci/reset.c | 1 + arch/arm/mach-davinci/spl.c | 1 + arch/arm/mach-imx/imx8/cpu.c | 1 + arch/arm/mach-imx/mx5/mx53_dram.c | 1 + arch/arm/mach-imx/mx6/ddr.c | 1 + arch/arm/mach-imx/mx6/litesom.c | 1 + arch/arm/mach-imx/mx7/clock.c | 1 + arch/arm/mach-imx/mx7ulp/clock.c | 1 + arch/arm/mach-imx/mx7ulp/soc.c | 1 + arch/arm/mach-imx/speed.c | 1 + arch/arm/mach-imx/spl.c | 1 + arch/arm/mach-k3/common.c | 1 + arch/arm/mach-k3/security.c | 1 + arch/arm/mach-keystone/ddr3.c | 1 + arch/arm/mach-keystone/mon.c | 1 + arch/arm/mach-kirkwood/cpu.c | 1 + arch/arm/mach-mediatek/mt7623/init.c | 1 + arch/arm/mach-mediatek/mt8516/init.c | 1 + arch/arm/mach-mediatek/mt8518/init.c | 1 + arch/arm/mach-mediatek/spl.c | 1 + arch/arm/mach-meson/board-axg.c | 1 + arch/arm/mach-meson/board-common.c | 1 + arch/arm/mach-meson/board-g12a.c | 1 + arch/arm/mach-meson/board-gx.c | 1 + arch/arm/mach-mvebu/armada3700/cpu.c | 1 + arch/arm/mach-mvebu/dram.c | 1 + arch/arm/mach-mvebu/spl.c | 1 + arch/arm/mach-omap2/am33xx/board.c | 1 + arch/arm/mach-omap2/am33xx/clock.c | 1 + arch/arm/mach-omap2/am33xx/fdt.c | 1 + arch/arm/mach-omap2/clocks-common.c | 1 + arch/arm/mach-omap2/emif-common.c | 3 + arch/arm/mach-omap2/omap5/dra7xx_iodelay.c | 1 + arch/arm/mach-omap2/omap5/fdt.c | 1 + arch/arm/mach-omap2/omap5/hwinit.c | 1 + arch/arm/mach-omap2/reset.c | 1 + arch/arm/mach-omap2/sec-common.c | 2 + arch/arm/mach-orion5x/dram.c | 1 + arch/arm/mach-orion5x/timer.c | 2 +- arch/arm/mach-rockchip/bootrom.c | 1 + arch/arm/mach-rockchip/rk3188/rk3188.c | 1 + arch/arm/mach-rockchip/spl.c | 1 + arch/arm/mach-rockchip/tpl.c | 1 + arch/arm/mach-socfpga/mailbox_s10.c | 1 + arch/arm/mach-socfpga/misc_gen5.c | 1 + arch/arm/mach-socfpga/spl_a10.c | 1 + arch/arm/mach-socfpga/spl_gen5.c | 1 + arch/arm/mach-socfpga/spl_s10.c | 1 + arch/arm/mach-stm32mp/spl.c | 1 + arch/arm/mach-sunxi/dram_sun4i.c | 1 + arch/arm/mach-tegra/board.c | 1 + arch/arm/mach-tegra/cboot.c | 1 + arch/arm/mach-tegra/cmd_enterrcm.c | 1 + arch/arm/mach-tegra/pmc.c | 1 + arch/arm/mach-uniphier/reset.c | 1 + arch/arm/mach-uniphier/spl_board_init.c | 1 + arch/arm/mach-versal/clk.c | 1 + arch/arm/mach-zynq/spl.c | 1 + arch/arm/mach-zynq/timer.c | 1 + arch/arm/mach-zynqmp-r5/cpu.c | 1 + arch/arm/mach-zynqmp/clk.c | 1 + arch/arm/mach-zynqmp/cpu.c | 1 + arch/m68k/cpu/mcf5227x/speed.c | 1 + arch/m68k/cpu/mcf5227x/start.S | 2 +- arch/m68k/cpu/mcf523x/speed.c | 1 + arch/m68k/cpu/mcf523x/start.S | 2 +- arch/m68k/cpu/mcf52x2/speed.c | 3 +- arch/m68k/cpu/mcf52x2/start.S | 2 +- arch/m68k/cpu/mcf530x/speed.c | 1 + arch/m68k/cpu/mcf530x/start.S | 2 +- arch/m68k/cpu/mcf532x/speed.c | 1 + arch/m68k/cpu/mcf532x/start.S | 2 +- arch/m68k/cpu/mcf5445x/speed.c | 1 + arch/m68k/cpu/mcf5445x/start.S | 2 +- arch/m68k/cpu/mcf547x_8x/speed.c | 1 + arch/m68k/cpu/mcf547x_8x/start.S | 2 +- arch/microblaze/cpu/exception.c | 1 + arch/microblaze/lib/bootm.c | 1 + arch/mips/cpu/time.c | 1 + arch/mips/lib/reloc.c | 1 + arch/mips/lib/traps.c | 1 + arch/mips/mach-ath79/ar933x/clk.c | 1 + arch/mips/mach-ath79/ar934x/clk.c | 2 + arch/mips/mach-ath79/dram.c | 1 + arch/mips/mach-ath79/qca953x/clk.c | 1 + arch/mips/mach-ath79/qca956x/clk.c | 1 + arch/mips/mach-jz47xx/jz4780/jz4780.c | 1 + arch/mips/mach-jz47xx/jz4780/sdram.c | 1 + arch/mips/mach-mtmips/cpu.c | 1 + arch/nds32/cpu/n1213/start.S | 2 +- arch/nds32/lib/bootm.c | 1 + arch/nds32/lib/interrupts.c | 1 + arch/nios2/cpu/start.S | 2 +- arch/nios2/cpu/traps.c | 5 +- arch/powerpc/cpu/mpc83xx/cpu.c | 1 + arch/powerpc/cpu/mpc83xx/fdt.c | 1 + arch/powerpc/cpu/mpc83xx/spd_sdram.c | 1 + arch/powerpc/cpu/mpc83xx/speed.c | 1 + arch/powerpc/cpu/mpc83xx/spl_minimal.c | 2 + arch/powerpc/cpu/mpc83xx/start.S | 2 +- arch/powerpc/cpu/mpc85xx/cpu.c | 3 +- arch/powerpc/cpu/mpc85xx/fdt.c | 2 + arch/powerpc/cpu/mpc85xx/interrupts.c | 1 + arch/powerpc/cpu/mpc85xx/speed.c | 5 +- arch/powerpc/cpu/mpc85xx/start.S | 2 +- arch/powerpc/cpu/mpc85xx/traps.c | 1 + arch/powerpc/cpu/mpc86xx/cpu.c | 1 + arch/powerpc/cpu/mpc86xx/interrupts.c | 1 + arch/powerpc/cpu/mpc86xx/speed.c | 1 + arch/powerpc/cpu/mpc86xx/start.S | 2 +- arch/powerpc/cpu/mpc86xx/traps.c | 1 + arch/powerpc/cpu/mpc8xx/cpu.c | 1 + arch/powerpc/cpu/mpc8xx/fdt.c | 1 + arch/powerpc/cpu/mpc8xx/interrupts.c | 1 + arch/powerpc/cpu/mpc8xx/speed.c | 1 + arch/powerpc/cpu/mpc8xx/start.S | 2 +- arch/powerpc/cpu/mpc8xxx/fsl_lbc.c | 1 + arch/powerpc/include/asm/ppc.h | 1 + arch/powerpc/lib/bootm.c | 1 + arch/riscv/cpu/start.S | 2 +- arch/riscv/lib/bootm.c | 2 + arch/riscv/lib/interrupts.c | 1 + arch/riscv/lib/reset.c | 1 + arch/riscv/lib/spl.c | 1 + arch/sandbox/cpu/spl.c | 1 + arch/sh/cpu/sh4/cpu.c | 2 +- arch/sh/cpu/sh4/watchdog.c | 1 + arch/sh/lib/board.c | 1 + arch/x86/cpu/baytrail/cpu.c | 1 + arch/x86/cpu/baytrail/valleyview.c | 1 + arch/x86/cpu/cpu.c | 1 + arch/x86/cpu/i386/cpu.c | 1 + arch/x86/cpu/i386/interrupt.c | 2 + arch/x86/cpu/quark/mrc_util.c | 1 + arch/x86/cpu/tangier/sdram.c | 1 + arch/x86/lib/bootm.c | 1 + arch/x86/lib/spl.c | 1 + arch/x86/lib/tpl.c | 1 + arch/xtensa/cpu/start.S | 2 +- board/AndesTech/adp-ae3xx/adp-ae3xx.c | 1 + board/AndesTech/adp-ag101p/adp-ag101p.c | 1 + board/AndesTech/ax25-ae350/ax25-ae350.c | 1 + board/Arcturus/ucp1020/spl.c | 2 + board/Arcturus/ucp1020/spl_minimal.c | 1 + board/BuR/brppt2/board.c | 2 + board/BuS/eb_cpu5282/eb_cpu5282.c | 3 +- board/CarMediaLab/flea3/flea3.c | 1 + board/LaCie/edminiv2/edminiv2.c | 1 + board/LaCie/net2big_v2/net2big_v2.c | 1 + board/LaCie/netspace_v2/netspace_v2.c | 1 + board/Marvell/db-88f6281-bp/db-88f6281-bp.c | 1 + board/Marvell/dreamplug/dreamplug.c | 1 + board/Marvell/guruplug/guruplug.c | 1 + board/Marvell/openrd/openrd.c | 1 + board/Marvell/sheevaplug/sheevaplug.c | 1 + board/Seagate/dockstar/dockstar.c | 1 + board/Seagate/goflexhome/goflexhome.c | 1 + board/Seagate/nas220/nas220.c | 1 + board/Synology/ds109/ds109.c | 1 + board/abilis/tb100/tb100.c | 1 + .../imx8qm_rom7720_a1/imx8qm_rom7720_a1.c | 1 + board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c | 1 + .../alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c | 1 + board/armadeus/apf27/apf27.c | 1 + board/armltd/integrator/integrator.c | 1 + board/armltd/integrator/timer.c | 2 +- board/armltd/vexpress/vexpress_common.c | 1 + board/armltd/vexpress64/vexpress64.c | 1 + board/astro/mcf5373l/mcf5373l.c | 1 + .../armadillo-800eva/armadillo-800eva.c | 1 + board/atmel/at91rm9200ek/at91rm9200ek.c | 1 + board/atmel/at91sam9260ek/at91sam9260ek.c | 2 + board/atmel/at91sam9261ek/at91sam9261ek.c | 1 + board/atmel/at91sam9263ek/at91sam9263ek.c | 2 + .../atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 2 + board/atmel/at91sam9n12ek/at91sam9n12ek.c | 1 + board/atmel/at91sam9rlek/at91sam9rlek.c | 1 + board/atmel/sam9x60ek/sam9x60ek.c | 1 + .../sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c | 1 + board/barco/platinum/platinum.c | 1 + board/barco/titanium/titanium.c | 1 + board/bluewater/snapper9260/snapper9260.c | 1 + board/bosch/shc/board.c | 1 + board/bosch/shc/mux.c | 1 + board/broadcom/bcm23550_w1d/bcm23550_w1d.c | 1 + board/broadcom/bcm28155_ap/bcm28155_ap.c | 1 + board/broadcom/bcm_ep/board.c | 1 + board/broadcom/bcmns2/northstar2.c | 2 + board/calao/usb_a9263/usb_a9263.c | 1 + board/cavium/thunderx/thunderx.c | 1 + board/cloudengines/pogo_e02/pogo_e02.c | 1 + board/cobra5272/cobra5272.c | 3 +- board/compulab/cl-som-imx7/spl.c | 2 + board/compulab/cm_fx6/spl.c | 3 + board/compulab/cm_t335/spl.c | 2 + board/compulab/cm_t43/spl.c | 2 + board/d-link/dns325/dns325.c | 1 + board/egnite/ethernut5/ethernut5.c | 1 + board/esd/meesc/meesc.c | 1 + board/esd/vme8349/vme8349.c | 2 + board/firefly/firefly-rk3288/firefly-rk3288.c | 1 + board/freescale/b4860qds/b4860qds.c | 1 + board/freescale/b4860qds/spl.c | 2 + board/freescale/bsc9131rdb/ddr.c | 1 + board/freescale/bsc9131rdb/spl_minimal.c | 1 + board/freescale/bsc9132qds/spl_minimal.c | 1 + board/freescale/c29xpcie/spl.c | 2 + board/freescale/c29xpcie/spl_minimal.c | 1 + board/freescale/corenet_ds/corenet_ds.c | 1 + board/freescale/imx8mm_evk/spl.c | 2 + board/freescale/imx8mn_evk/spl.c | 2 + board/freescale/imx8mq_evk/spl.c | 1 + board/freescale/imx8qm_mek/imx8qm_mek.c | 1 + board/freescale/imx8qxp_mek/imx8qxp_mek.c | 1 + board/freescale/ls1012afrdm/eth.c | 1 + board/freescale/ls1012afrdm/ls1012afrdm.c | 1 + board/freescale/ls1012ardb/eth.c | 1 + board/freescale/ls1012ardb/ls1012ardb.c | 2 + board/freescale/ls1021aiot/ls1021aiot.c | 2 + board/freescale/ls1021aqds/ls1021aqds.c | 2 + board/freescale/ls1021atsn/ls1021atsn.c | 2 + board/freescale/ls1021atwr/ls1021atwr.c | 2 + board/freescale/ls1088a/eth_ls1088aqds.c | 1 + board/freescale/ls1088a/eth_ls1088ardb.c | 1 + board/freescale/ls2080a/ls2080a.c | 1 + board/freescale/ls2080aqds/eth.c | 1 + board/freescale/ls2080ardb/eth_ls2080rdb.c | 1 + board/freescale/lx2160a/eth_lx2160aqds.c | 1 + board/freescale/lx2160a/eth_lx2160ardb.c | 1 + board/freescale/lx2160a/lx2160a.c | 1 + board/freescale/m5208evbe/m5208evbe.c | 1 + board/freescale/m52277evb/m52277evb.c | 1 + board/freescale/m5235evb/m5235evb.c | 1 + board/freescale/m5249evb/m5249evb.c | 4 +- board/freescale/m5253demo/m5253demo.c | 1 + board/freescale/m5272c3/m5272c3.c | 4 +- board/freescale/m5275evb/m5275evb.c | 1 + board/freescale/m53017evb/m53017evb.c | 1 + board/freescale/m5329evb/m5329evb.c | 1 + board/freescale/m5373evb/m5373evb.c | 1 + board/freescale/m54418twr/m54418twr.c | 1 + board/freescale/m54451evb/m54451evb.c | 1 + board/freescale/mpc8308rdb/sdram.c | 1 + board/freescale/mpc8313erdb/mpc8313erdb.c | 2 + board/freescale/mpc8323erdb/mpc8323erdb.c | 1 + board/freescale/mpc832xemds/mpc832xemds.c | 1 + board/freescale/mpc8349emds/mpc8349emds.c | 1 + board/freescale/mpc8349itx/mpc8349itx.c | 1 + board/freescale/mpc837xerdb/mpc837xerdb.c | 1 + board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c | 1 + board/freescale/mx53ard/mx53ard.c | 1 + board/freescale/mx53smd/mx53smd.c | 1 + board/freescale/mx6memcal/spl.c | 1 + board/freescale/p1010rdb/spl.c | 2 + board/freescale/p1010rdb/spl_minimal.c | 1 + board/freescale/p1022ds/diu.c | 1 + board/freescale/p1022ds/spl.c | 2 + board/freescale/p1022ds/spl_minimal.c | 1 + board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 1 + board/freescale/p1_p2_rdb_pc/spl.c | 2 + board/freescale/p1_p2_rdb_pc/spl_minimal.c | 1 + board/freescale/p2041rdb/p2041rdb.c | 1 + board/freescale/qemu-ppce500/qemu-ppce500.c | 7 +- board/freescale/s32v234evb/s32v234evb.c | 1 + board/freescale/t102xqds/spl.c | 2 + board/freescale/t102xqds/t102xqds.c | 1 + board/freescale/t102xrdb/spl.c | 2 + board/freescale/t102xrdb/t102xrdb.c | 1 + board/freescale/t1040qds/diu.c | 1 + board/freescale/t1040qds/t1040qds.c | 1 + board/freescale/t104xrdb/diu.c | 1 + board/freescale/t104xrdb/spl.c | 2 + board/freescale/t104xrdb/t104xrdb.c | 1 + board/freescale/t208xqds/spl.c | 2 + board/freescale/t208xqds/t208xqds.c | 1 + board/freescale/t208xrdb/spl.c | 2 + board/freescale/t208xrdb/t208xrdb.c | 1 + board/freescale/t4qds/spl.c | 2 + board/freescale/t4qds/t4240emu.c | 1 + board/freescale/t4qds/t4240qds.c | 1 + board/freescale/t4rdb/spl.c | 2 + board/freescale/t4rdb/t4240rdb.c | 1 + board/freescale/vf610twr/vf610twr.c | 1 + board/gateworks/gw_ventana/gw_ventana_spl.c | 1 + board/gdsys/mpc8308/sdram.c | 1 + board/gdsys/p1022/controlcenterd-id.c | 1 + board/gdsys/p1022/diu.c | 1 + board/hisilicon/hikey/hikey.c | 2 + board/hisilicon/hikey960/hikey960.c | 1 + board/hisilicon/poplar/poplar.c | 2 + board/ids/ids8313/ids8313.c | 2 + board/inversepath/usbarmory/usbarmory.c | 2 + board/keymile/km83xx/km83xx.c | 1 + board/keymile/km_arm/km_arm.c | 1 + board/keymile/kmp204x/kmp204x.c | 1 + board/kmc/kzm9g/kzm9g.c | 1 + board/kosagi/novena/novena_spl.c | 1 + board/l+g/vinco/vinco.c | 1 + board/laird/wb45n/wb45n.c | 1 + board/liebherr/display5/spl.c | 1 + board/mini-box/picosam9g45/picosam9g45.c | 1 + board/mpc8308_p1m/sdram.c | 1 + board/phytec/pcl063/pcl063.c | 1 + board/phytec/phycore_am335x_r2/board.c | 1 + board/phytium/durian/durian.c | 1 + .../dragonboard410c/dragonboard410c.c | 1 + .../dragonboard820c/dragonboard820c.c | 1 + board/renesas/alt/alt.c | 2 + board/renesas/alt/alt_spl.c | 1 + board/renesas/blanche/blanche.c | 1 + board/renesas/condor/condor.c | 2 + board/renesas/draak/draak.c | 2 + board/renesas/eagle/eagle.c | 2 + board/renesas/ebisu/ebisu.c | 2 + board/renesas/gose/gose.c | 2 + board/renesas/gose/gose_spl.c | 1 + board/renesas/grpeach/grpeach.c | 1 + board/renesas/koelsch/koelsch.c | 2 + board/renesas/koelsch/koelsch_spl.c | 1 + board/renesas/lager/lager.c | 2 + board/renesas/lager/lager_spl.c | 1 + board/renesas/porter/porter.c | 2 + board/renesas/porter/porter_spl.c | 1 + board/renesas/rcar-common/gen3-spl.c | 1 + board/renesas/salvator-x/salvator-x.c | 1 + board/renesas/silk/silk.c | 2 + board/renesas/silk/silk_spl.c | 1 + board/renesas/stout/cpld.c | 1 + board/renesas/stout/stout_spl.c | 1 + board/ronetix/pm9261/pm9261.c | 1 + board/ronetix/pm9263/pm9263.c | 1 + board/ronetix/pm9g45/pm9g45.c | 1 + board/samsung/arndale/arndale.c | 1 + board/samsung/common/board.c | 1 + board/samsung/smdkc100/smdkc100.c | 1 + board/samsung/smdkv310/smdkv310.c | 1 + board/sbc8349/sbc8349.c | 1 + board/sbc8641d/sbc8641d.c | 2 +- board/seco/mx6quq7/mx6quq7.c | 1 + board/siemens/corvus/board.c | 1 + board/siemens/smartweb/smartweb.c | 1 + board/siemens/taurus/taurus.c | 1 + board/socrates/sdram.c | 3 +- board/socrates/socrates.c | 5 +- board/st/stm32mp1/stm32mp1.c | 1 + board/sunxi/board.c | 2 + board/synopsys/emsdp/emsdp.c | 1 + board/synopsys/iot_devkit/iot_devkit.c | 1 + board/sysam/amcore/amcore.c | 1 + board/sysam/stmark2/stmark2.c | 1 + board/technexion/pico-imx6ul/spl.c | 4 + board/technexion/pico-imx7d/spl.c | 1 + board/technologic/ts4800/ts4800.c | 1 + board/ti/am43xx/board.c | 1 + board/ti/am57xx/board.c | 1 + board/ti/dra7xx/evm.c | 1 + board/ti/ks2_evm/board.c | 2 + board/ti/ks2_evm/board_k2g.c | 1 + board/timll/devkit3250/devkit3250.c | 1 + board/toradex/apalis-imx8/apalis-imx8.c | 1 + board/toradex/apalis_imx6/apalis_imx6.c | 1 + board/toradex/colibri-imx8x/colibri-imx8x.c | 1 + board/toradex/colibri_imx6/colibri_imx6.c | 1 + board/toradex/colibri_imx7/colibri_imx7.c | 3 + board/tqc/tqm834x/tqm834x.c | 2 + board/ucRobotics/bubblegum_96/bubblegum_96.c | 1 + board/varisys/cyrus/cyrus.c | 1 + board/ve8313/ve8313.c | 3 +- board/woodburn/woodburn.c | 1 + board/xilinx/versal/board.c | 1 + board/zyxel/nsa310s/nsa310s.c | 1 + cmd/Kconfig | 5 - cmd/Makefile | 1 - cmd/bmp.c | 9 +- cmd/booti.c | 4 +- cmd/bootm.c | 5 +- cmd/bootz.c | 5 +- cmd/cramfs.c | 5 +- cmd/disk.c | 3 +- cmd/elf.c | 5 +- cmd/fat.c | 2 +- cmd/fdc.c | 752 ------------------ cmd/jffs2.c | 5 +- cmd/load.c | 10 +- cmd/mem.c | 57 +- cmd/mvebu/bubt.c | 7 +- cmd/nand.c | 3 +- cmd/net.c | 13 +- cmd/pxe.c | 2 + cmd/pxe_utils.c | 5 +- cmd/reiser.c | 2 +- cmd/source.c | 8 +- cmd/ti/ddr3.c | 1 + cmd/tpm_test.c | 1 + cmd/ximg.c | 2 +- cmd/zfs.c | 2 +- common/board_f.c | 2 + common/board_r.c | 7 +- common/bootstage.c | 1 + common/cli.c | 1 + common/command.c | 2 +- common/flash.c | 2 +- common/image-fdt.c | 5 +- common/image.c | 18 +- common/main.c | 1 + common/memsize.c | 1 + common/spl/spl.c | 1 + common/spl/spl_net.c | 4 +- common/spl/spl_opensbi.c | 1 + common/update.c | 4 +- drivers/cache/cache-v5l2.c | 1 + drivers/clk/clk_pic32.c | 1 + drivers/clk/mpc83xx_clk.c | 1 + drivers/ddr/altera/sdram_gen5.c | 1 + drivers/ddr/altera/sdram_s10.c | 2 + .../marvell/a38x/ddr3_training_ip_engine.c | 7 +- drivers/misc/Makefile | 1 - drivers/misc/imx8/scu_api.c | 1 + drivers/misc/ns87308.c | 100 --- drivers/mmc/fsl_esdhc_spl.c | 1 + drivers/mtd/nand/raw/mxc_nand_spl.c | 1 + drivers/mtd/spi/fsl_espi_spl.c | 1 + drivers/net/ag7xxx.c | 1 + drivers/net/fsl_mcdmafec.c | 1 + drivers/net/mcffec.c | 1 + drivers/net/mpc8xx_fec.c | 1 + drivers/pci/pci_rom.c | 1 + drivers/ram/bmips_ram.c | 1 + drivers/ram/k3-j721e/k3-j721e-ddrss.c | 1 + drivers/ram/mpc83xx_sdram.c | 1 + drivers/ram/rockchip/dmc-rk3368.c | 1 + drivers/ram/rockchip/sdram_rk3188.c | 1 + drivers/ram/rockchip/sdram_rk3288.c | 1 + drivers/ram/stm32mp1/stm32mp1_ram.c | 1 + drivers/ram/stm32mp1/stm32mp1_tests.c | 1 + drivers/serial/lpc32xx_hsuart.c | 1 + drivers/serial/ns16550.c | 1 + drivers/serial/serial.c | 1 + drivers/serial/serial_ar933x.c | 1 + drivers/serial/serial_ns16550.c | 8 +- drivers/serial/serial_pxa.c | 1 + drivers/spi/ath79_spi.c | 1 + drivers/sysreset/sysreset-uclass.c | 2 + drivers/usb/gadget/f_sdp.c | 2 +- drivers/usb/musb/musb_udc.c | 1 + drivers/usb/phy/rockchip_usb2_phy.c | 1 + drivers/video/broadwell_igd.c | 1 + drivers/watchdog/imx_watchdog.c | 2 + drivers/watchdog/mtk_wdt.c | 1 + drivers/watchdog/ulp_wdog.c | 1 + drivers/watchdog/wdt-uclass.c | 1 + env/flash.c | 1 + examples/api/libgenwrap.c | 3 +- include/clock_legacy.h | 14 + include/common.h | 150 +--- include/compiler.h | 4 + include/cpu_func.h | 2 + include/eeprom.h | 4 + include/exports.h | 3 + include/fdt_support.h | 14 + include/fdtdec.h | 3 + include/flash.h | 7 + include/fs.h | 22 + include/hang.h | 22 + include/image.h | 16 + include/init.h | 29 + include/linux/kernel.h | 13 + include/linux/types.h | 4 + include/net.h | 19 + include/ns87308.h | 233 ------ include/time.h | 2 + lib/display_options.c | 8 +- lib/efi/efi_app.c | 1 + lib/fdtdec.c | 2 + lib/hang.c | 1 + lib/libavb/avb_sysdeps_posix.c | 1 + lib/optee/optee.c | 1 + lib/panic.c | 1 + lib/zlib/zutil.c | 3 +- net/net.c | 3 +- net/nfs.c | 11 +- net/tftp.c | 15 +- post/Makefile | 2 +- scripts/config_whitelist.txt | 37 - 534 files changed, 895 insertions(+), 1466 deletions(-) delete mode 100644 cmd/fdc.c delete mode 100644 drivers/misc/ns87308.c create mode 100644 include/clock_legacy.h create mode 100644 include/hang.h delete mode 100644 include/ns87308.h
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 1/35 common: Drop mdm_init()
This is not used in U-Boot. Drop it.
---
Changes in v2: None
include/common.h | 1 - 1 file changed, 1 deletion(-)
include/common.h +0 -1
@@ -71,7 +71,6 @@ int checkflash(void);int checkdram (void );extern u8 __dtb_dt_begin[];/* embedded device tree blob */ extern u8 __dtb_dt_spl_begin[];/* embedded device tree blob for SPL/TPL */ -int mdm_init (void );/** * arch_fixup_fdt() - Write arch-specific information to fdt
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 1/35 common: Drop mdm_init()
Quoted 4 lines · Simon Glass
This is not used in U-Boot. Drop it.
Signed-off-by Simon Glass <[email protected]>Reviewed-by Simon Goldschmidt <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/d45ac5bf/attachment.sig>
PATCH v2 2/35 common: Move main_loop() to init.h
In reply to Simon GlassMove this function out of common.h and into a better place.
---
Changes in v2: None
common/board_r.c | 1 + common/main.c | 1 + include/common.h | 3 --- include/init.h | 7 +++++++ 4 files changed, 9 insertions(+), 3 deletions(-)
common/board_r.c +1 -0
@@ -26,6 +26,7 @@#include <env_internal.h> #include <fdtdec.h> #include <ide.h> +#include <init.h> #include <initcall.h> #if defined(CONFIG_CMD_KGDB )#include <kgdb.h>
common/main.c +1 -0
@@ -12,6 +12,7 @@#include <command.h> #include <console.h> #include <env.h> +#include <init.h> #include <version.h> /*
include/common.h +0 -3
@@ -64,9 +64,6 @@ void hang (void) __attribute__ ((noreturn));#include <display_options.h> -/* common/main.c */ -void main_loop (void ); -int checkflash (void );int checkdram (void );extern u8 __dtb_dt_begin[];/* embedded device tree blob */
include/init.h +7 -0
@@ -221,6 +221,13 @@ void pci_init_board(void);void trap_init (unsigned long reloc_addr); +/** +* main_loop() - Enter the main loop of U-Boot +* +* This normally runs the command line. +*/ +void main_loop (void ); +#endif /* __ASSEMBLY__ */ /* Put only stuff here that the assembler can digest */
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 2/35 common: Move main_loop() to init.h
Quoted 4 lines · Simon Glass
Move this function out of
common.hand into a better place.Signed-off-by Simon Glass <[email protected]>Reviewed-by Simon Goldschmidt <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/b64a271c/attachment.sig>
PATCH v2 3/35 common: Move flash_perror() to flash.h
In reply to Simon GlassThis function belongs more in flash.h than common.h so move it.
Also remove the space before the bracket in some calls.
---
Changes in v2: None
cmd/load.c | 3 ++- cmd/mem.c | 3 ++- common/flash.c | 2 +- env/flash.c | 1 + include/common.h | 3 --- include/flash.h | 7 +++++++ net/nfs.c | 1 + 7 files changed, 14 insertions(+), 6 deletions(-)
cmd/load.c +2 -1
@@ -12,6 +12,7 @@#include <console.h> #include <cpu_func.h> #include <env.h> +#include <flash.h> #include <s_record.h> #include <net.h> #include <exports.h>
@@ -980,7 +981,7 @@ static ulong load_serial_ymodem(ulong offset, int mode) rc =flash_write ((char *) ymodemBuf, store_addr, res);if (rc !=0 ) { -flash_perror (rc); +flash_perror (rc);return (~0 ); } }else
cmd/mem.c +2 -1
@@ -16,6 +16,7 @@#include <cli.h> #include <command.h> #include <console.h> +#include <flash.h> #include <hash.h> #include <mapmem.h> #include <watchdog.h>
@@ -339,7 +340,7 @@ static int do_mem_cp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) rc =flash_write ((char *)src, (ulong )dst, count * size);if (rc !=0 ) { -flash_perror (rc); +flash_perror (rc);unmap_sysmem (src);unmap_sysmem (dst);return (1 );
common/flash.c +1 -1
@@ -179,7 +179,7 @@ flash_write (char *src, ulong addr, ulong cnt)/*----------------------------------------------------------------------- */ -void flash_perror (int err) +void flash_perror (int err) {switch (err) {case ERR_OK :
env/flash.c +1 -0
@@ -13,6 +13,7 @@#include <command.h> #include <env.h> #include <env_internal.h> +#include <flash.h> #include <linux/stddef.h> #include <malloc.h> #include <search.h>
include/common.h +0 -3
@@ -79,9 +79,6 @@ extern u8 __dtb_dt_spl_begin[]; /* embedded device tree blob for SPL/TPL */*/ int arch_fixup_fdt (void *blob); -/* common/flash.c */ -void flash_perror (int ); -/* common/cmd_source.c */ int source (ulong addr,const char *fit_uname);
include/flash.h +7 -0
@@ -117,6 +117,13 @@ extern int jedec_flash_match(flash_info_t *info, ulong base);#define CFI_CMDSET_AMD_LEGACY 0xFFF0#endif +/** +* flash_perror() - Print a flash error +* +* @err: Error number of message to print (ERR_... as below) +*/ +void flash_perror (int err); +/*----------------------------------------------------------------------- * return codes from flash_write(): */
net/nfs.c +1 -0
@@ -28,6 +28,7 @@#include <common.h> #include <command.h> +#include <flash.h> #include <net.h> #include <malloc.h> #include <mapmem.h>
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 3/35 common: Move flash_perror() to flash.h
Quoted 5 lines · Simon Glass
This function belongs more in
flash.hthancommon.hso move it.Also remove the space before the bracket in some calls.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/8fe6a9b0/attachment.sig>
PATCH v2 4/35 common: Drop checkflash() and checkdram()
In reply to Simon GlassThese functions are not used in U-Boot. Drop them.
---
Changes in v2: None
include/common.h | 2 -- 1 file changed, 2 deletions(-)
include/common.h +0 -2
@@ -64,8 +64,6 @@ void hang (void) __attribute__ ((noreturn));#include <display_options.h> -int checkflash (void ); -int checkdram (void );extern u8 __dtb_dt_begin[];/* embedded device tree blob */ extern u8 __dtb_dt_spl_begin[];/* embedded device tree blob for SPL/TPL */
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 4/35 common: Drop checkflash() and checkdram()
Quoted 3 lines · Simon Glass
These functions are not used in U-Boot. Drop them.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/e42d62ee/attachment.sig>
PATCH v2 5/35 common: Move embedded fdt location to fdtdec.h
In reply to Simon GlassThese declarations are only used in fdtdec.c so move them to its header file.
---
Changes in v2: None
include/common.h | 3 --- include/fdtdec.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)
include/common.h +0 -3
@@ -64,9 +64,6 @@ void hang (void) __attribute__ ((noreturn));#include <display_options.h> -extern u8 __dtb_dt_begin[];/* embedded device tree blob */ -extern u8 __dtb_dt_spl_begin[];/* embedded device tree blob for SPL/TPL */ -/** * arch_fixup_fdt() - Write arch-specific information to fdt *
include/fdtdec.h +3 -0
@@ -111,6 +111,9 @@ struct fdt_pci_addr {u32 phys_lo; }; +extern u8 __dtb_dt_begin[];/* embedded device tree blob */ +extern u8 __dtb_dt_spl_begin[];/* embedded device tree blob for SPL/TPL */ +/** * Compute the size of a resource. *
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 5/35 common: Move embedded fdt location to fdtdec.h
Quoted 4 lines · Simon Glass
These declarations are only used in
fdtdec.cso move them to its header file.Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/3efbb5b0/attachment.sig>
PATCH v2 6/35 common: Move do_tftpb() to net.h
In reply to Simon GlassThis function belongs in the network header file. Move it.
---
Changes in v2: None
cmd/pxe.c | 1 + include/common.h | 3 --- include/net.h | 11 +++++++++++ 3 files changed, 12 insertions(+), 3 deletions(-)
cmd/pxe.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> +#include <net.h> #include "pxe_utils.h"
include/common.h +0 -3
@@ -81,9 +81,6 @@ extern ulong load_addr; /* Default Load Address */extern ulong save_addr;/* Default Save Address */ extern ulong save_size;/* Default Save Size */ -/* common/cmd_net.c */ -int do_tftpb (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]); -/* common/cmd_fat.c */ int do_fat_fsload (cmd_tbl_t *,int ,int ,char *const []);
include/net.h +11 -0
@@ -50,6 +50,17 @@ struct in_addr {__be32 s_addr; }; +/** +* do_tftpb - Run the tftpboot command +* +* @cmdtp: Command information for tftpboot +* @flag: Command flags (CMD_FLAG_...) +* @argc: Number of arguments +* @argv: List of arguments +* @return result (see enum command_ret_t) +*/ +int do_tftpb (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]); +/** * An incoming packet handler. * @param pkt pointer to the application packet
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 6/35 common: Move do_tftpb() to net.h
Quoted 3 lines · Simon Glass
This function belongs in the network header file. Move it.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/76a1fe00/attachment.sig>
PATCH v2 7/35 common: Move functions for loading from fat/ext2 to fs.h
In reply to Simon GlassThese are filesystem functions and belong in the filesystem header file. Move them.
---
Changes in v2: None
board/inversepath/usbarmory/usbarmory.c | 1 + cmd/fat.c | 2 +- cmd/pxe.c | 1 + include/common.h | 6 ------ include/fs.h | 22 ++++++++++++++++++++++ 5 files changed, 25 insertions(+), 7 deletions(-)
board/inversepath/usbarmory/usbarmory.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <command.h> +#include <fs.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/sys_proto.h>
cmd/fat.c +1 -1
@@ -31,7 +31,7 @@ U_BOOT_CMD(" and determine its size." ); -int do_fat_fsload (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) +int do_fat_fsload (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {return do_load (cmdtp, flag, argc, argv,FS_TYPE_FAT ); }
cmd/pxe.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> +#include <fs.h> #include <net.h> #include "pxe_utils.h"
include/common.h +0 -6
@@ -81,12 +81,6 @@ extern ulong load_addr; /* Default Load Address */extern ulong save_addr;/* Default Save Address */ extern ulong save_size;/* Default Save Size */ -/* common/cmd_fat.c */ -int do_fat_fsload (cmd_tbl_t *,int ,int ,char *const []); - -/* common/cmd_ext2.c */ -int do_ext2load (cmd_tbl_t *,int ,int ,char *const []); -/* common/exports.c */ void jumptable_init (void );
include/fs.h +22 -0
@@ -14,6 +14,28 @@#define FS_TYPE_UBIFS 4#define FS_TYPE_BTRFS 5 +/** +* do_fat_fsload - Run the fatload command +* +* @cmdtp: Command information for fatload +* @flag: Command flags (CMD_FLAG_...) +* @argc: Number of arguments +* @argv: List of arguments +* @return result (see enum command_ret_t) +*/ +int do_fat_fsload (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]); + +/** +* do_ext2load - Run the ext2load command +* +* @cmdtp: Command information for ext2load +* @flag: Command flags (CMD_FLAG_...) +* @argc: Number of arguments +* @argv: List of arguments +* @return result (see enum command_ret_t) +*/ +int do_ext2load (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]); +/* * Tell the fs layer which block device an partition to use for future * commands. This also internally identifies the filesystem that is present
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 7/35 common: Move functions for loading from fat/ext2 to fs.h
Quoted 4 lines · Simon Glass
These are filesystem functions and belong in the filesystem header file. Move them.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/9b59c01f/attachment.sig>
PATCH v2 8/35 common: Move relocate_code() to init.h
In reply to Simon GlassThis is an init function so move it out of the common header. Avoid using the typedef so that we don't have to include the global_data header file.
Also tidy up the function style in comments while we are here.
---
Changes in v2: None
arch/arm/lib/relocate_64.S | 2 +- arch/m68k/cpu/mcf5227x/start.S | 2 +- arch/m68k/cpu/mcf523x/start.S | 2 +- arch/m68k/cpu/mcf52x2/start.S | 2 +- arch/m68k/cpu/mcf530x/start.S | 2 +- arch/m68k/cpu/mcf532x/start.S | 2 +- arch/m68k/cpu/mcf5445x/start.S | 2 +- arch/m68k/cpu/mcf547x_8x/start.S | 2 +- arch/mips/lib/reloc.c | 1 + arch/nds32/cpu/n1213/start.S | 2 +- arch/nios2/cpu/start.S | 2 +- arch/powerpc/cpu/mpc83xx/start.S | 2 +- arch/powerpc/cpu/mpc85xx/start.S | 2 +- arch/powerpc/cpu/mpc86xx/start.S | 2 +- arch/powerpc/cpu/mpc8xx/start.S | 2 +- arch/riscv/cpu/start.S | 2 +- arch/sh/lib/board.c | 1 + arch/xtensa/cpu/start.S | 2 +- board/Arcturus/ucp1020/spl.c | 1 + board/Arcturus/ucp1020/spl_minimal.c | 1 + board/freescale/b4860qds/spl.c | 1 + board/freescale/bsc9131rdb/spl_minimal.c | 1 + board/freescale/bsc9132qds/spl_minimal.c | 1 + board/freescale/c29xpcie/spl.c | 1 + board/freescale/c29xpcie/spl_minimal.c | 1 + board/freescale/p1010rdb/spl.c | 1 + board/freescale/p1010rdb/spl_minimal.c | 1 + board/freescale/p1022ds/spl.c | 1 + board/freescale/p1022ds/spl_minimal.c | 1 + board/freescale/p1_p2_rdb_pc/spl.c | 1 + board/freescale/p1_p2_rdb_pc/spl_minimal.c | 1 + board/freescale/t102xqds/spl.c | 1 + board/freescale/t102xrdb/spl.c | 1 + board/freescale/t104xrdb/spl.c | 1 + board/freescale/t208xqds/spl.c | 1 + board/freescale/t208xrdb/spl.c | 1 + board/freescale/t4qds/spl.c | 1 + board/freescale/t4rdb/spl.c | 1 + include/common.h | 6 ------ include/init.h | 10 ++++++++++ 40 files changed, 48 insertions(+), 22 deletions(-)
arch/arm/lib/relocate_64.S +1 -1
@@ -14,7 +14,7 @@ #include <asm/macro.h> /* - * void relocate_code (addr_moni) + * void relocate_code(addr_moni) * * This function relocates the monitor code. * x0 holds the destination address.
arch/m68k/cpu/mcf5227x/start.S +1 -1
@@ -386,7 +386,7 @@ _start: /******************************************************************************/ /* - * void relocate_code (addr_sp, gd, addr_moni) + * void relocate_code(addr_sp, gd, addr_moni) * * This "function" does not return, instead it continues in RAM * after relocating the monitor code.
arch/m68k/cpu/mcf523x/start.S +1 -1
@@ -150,7 +150,7 @@ _start: /******************************************************************************/ /* - * void relocate_code (addr_sp, gd, addr_moni) + * void relocate_code(addr_sp, gd, addr_moni) * * This "function" does not return, instead it continues in RAM * after relocating the monitor code.
arch/m68k/cpu/mcf52x2/start.S +1 -1
@@ -229,7 +229,7 @@ _after_flashbar_copy: /******************************************************************************/ /* - * void relocate_code (addr_sp, gd, addr_moni) + * void relocate_code(addr_sp, gd, addr_moni) * * This "function" does not return, instead it continues in RAM * after relocating the monitor code.
arch/m68k/cpu/mcf530x/start.S +1 -1
@@ -155,7 +155,7 @@ _start: /******************************************************************************/ /* - * void relocate_code (addr_sp, gd, addr_moni) + * void relocate_code(addr_sp, gd, addr_moni) * * This "function" does not return, instead it continues in RAM * after relocating the monitor code.
arch/m68k/cpu/mcf532x/start.S +1 -1
@@ -165,7 +165,7 @@ _start: /******************************************************************************/ /* - * void relocate_code (addr_sp, gd, addr_moni) + * void relocate_code(addr_sp, gd, addr_moni) * * This "function" does not return, instead it continues in RAM * after relocating the monitor code.
arch/m68k/cpu/mcf5445x/start.S +1 -1
@@ -514,7 +514,7 @@ _start: /******************************************************************************/ /* - * void relocate_code (addr_sp, gd, addr_moni) + * void relocate_code(addr_sp, gd, addr_moni) * * This "function" does not return, instead it continues in RAM * after relocating the monitor code.
arch/m68k/cpu/mcf547x_8x/start.S +1 -1
@@ -155,7 +155,7 @@ _start: /******************************************************************************/ /* - * void relocate_code (addr_sp, gd, addr_moni) + * void relocate_code(addr_sp, gd, addr_moni) * * This "function" does not return, instead it continues in RAM * after relocating the monitor code.
arch/mips/lib/reloc.c +1 -0
@@ -28,6 +28,7 @@#include <common.h> #include <cpu_func.h> +#include <init.h> #include <asm/relocs.h> #include <asm/sections.h>
arch/nds32/cpu/n1213/start.S +1 -1
@@ -223,7 +223,7 @@ call_board_init_f: j board_init_f ! jump to board_init_f() in lib/board.c /* - * void relocate_code (addr_sp, gd, addr_moni) + * void relocate_code(addr_sp, gd, addr_moni) * * This "function" does not return, instead it continues in RAM * after relocating the monitor code.
arch/nios2/cpu/start.S +1 -1
@@ -147,7 +147,7 @@ _reloc: * We'll call the board_init_r from here since this isn't * supposed to return. * - * void relocate_code (ulong sp, gd_t *global_data, + * void relocate_code(ulong sp, gd_t *global_data, * ulong reloc_addr) * __attribute__ ((noreturn)); */
arch/powerpc/cpu/mpc83xx/start.S +1 -1
@@ -804,7 +804,7 @@ flush_dcache: /*-------------------------------------------------------------------*/ /* - * void relocate_code (addr_sp, gd, addr_moni) + * void relocate_code(addr_sp, gd, addr_moni) * * This "function" does not return, instead it continues in RAM * after relocating the monitor code.
arch/powerpc/cpu/mpc85xx/start.S +1 -1
@@ -1549,7 +1549,7 @@ write_tlb: blr /* - * void relocate_code (addr_sp, gd, addr_moni) + * void relocate_code(addr_sp, gd, addr_moni) * * This "function" does not return, instead it continues in RAM * after relocating the monitor code.
arch/powerpc/cpu/mpc86xx/start.S +1 -1
@@ -636,7 +636,7 @@ in32r: blr /* - * void relocate_code (addr_sp, gd, addr_moni) + * void relocate_code(addr_sp, gd, addr_moni) * * This "function" does not return, instead it continues in RAM * after relocating the monitor code.
arch/powerpc/cpu/mpc8xx/start.S +1 -1
@@ -322,7 +322,7 @@ int_return: /*------------------------------------------------------------------------------*/ /* - * void relocate_code (addr_sp, gd, addr_moni) + * void relocate_code(addr_sp, gd, addr_moni) * * This "function" does not return, instead it continues in RAM * after relocating the monitor code.
arch/riscv/cpu/start.S +1 -1
@@ -217,7 +217,7 @@ spl_call_board_init_r: #endif /* - * void relocate_code (addr_sp, gd, addr_moni) + * void relocate_code(addr_sp, gd, addr_moni) * * This "function" does not return, instead it continues in RAM * after relocating the monitor code.
arch/sh/lib/board.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <init.h> DECLARE_GLOBAL_DATA_PTR ;
arch/xtensa/cpu/start.S +1 -1
@@ -273,7 +273,7 @@ _start: ill /* - * void relocate_code (addr_sp, gd, addr_moni) + * void relocate_code(addr_sp, gd, addr_moni) * * This "function" does not return, instead it continues in RAM * after relocating the monitor code.
board/Arcturus/ucp1020/spl.c +1 -0
@@ -11,6 +11,7 @@#include <console.h> #include <env.h> #include <env_internal.h> +#include <init.h> #include <ns16550.h> #include <malloc.h> #include <mmc.h>
board/Arcturus/ucp1020/spl_minimal.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <init.h> #include <ns16550.h> #include <asm/io.h> #include <nand.h>
board/freescale/b4860qds/spl.c +1 -0
@@ -6,6 +6,7 @@#include <console.h> #include <env.h> #include <env_internal.h> +#include <init.h> #include <asm/spl.h> #include <malloc.h> #include <ns16550.h>
board/freescale/bsc9131rdb/spl_minimal.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <init.h> #include <ns16550.h> #include <asm/io.h> #include <nand.h>
board/freescale/bsc9132qds/spl_minimal.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <init.h> #include <ns16550.h> #include <asm/io.h> #include <nand.h>
board/freescale/c29xpcie/spl.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <console.h> #include <env_internal.h> +#include <init.h> #include <ns16550.h> #include <malloc.h> #include <mmc.h>
board/freescale/c29xpcie/spl_minimal.c +1 -0
@@ -3,6 +3,7 @@*/ #include <common.h> +#include <init.h> #include <mpc85xx.h> #include <asm/io.h> #include <ns16550.h>
board/freescale/p1010rdb/spl.c +1 -0
@@ -6,6 +6,7 @@#include <console.h> #include <env.h> #include <env_internal.h> +#include <init.h> #include <ns16550.h> #include <malloc.h> #include <mmc.h>
board/freescale/p1010rdb/spl_minimal.c +1 -0
@@ -3,6 +3,7 @@* Copyright 2011 Freescale Semiconductor, Inc. */ #include <common.h> +#include <init.h> #include <mpc85xx.h> #include <asm/io.h> #include <ns16550.h>
board/freescale/p1022ds/spl.c +1 -0
@@ -7,6 +7,7 @@#include <console.h> #include <env.h> #include <env_internal.h> +#include <init.h> #include <ns16550.h> #include <malloc.h> #include <mmc.h>
board/freescale/p1022ds/spl_minimal.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <init.h> #include <ns16550.h> #include <asm/io.h> #include <nand.h>
board/freescale/p1_p2_rdb_pc/spl.c +1 -0
@@ -7,6 +7,7 @@#include <console.h> #include <env.h> #include <env_internal.h> +#include <init.h> #include <ns16550.h> #include <malloc.h> #include <mmc.h>
board/freescale/p1_p2_rdb_pc/spl_minimal.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <init.h> #include <ns16550.h> #include <asm/io.h> #include <nand.h>
board/freescale/t102xqds/spl.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <console.h> #include <env_internal.h> +#include <init.h> #include <malloc.h> #include <ns16550.h> #include <nand.h>
board/freescale/t102xrdb/spl.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <console.h> #include <env_internal.h> +#include <init.h> #include <malloc.h> #include <ns16550.h> #include <nand.h>
board/freescale/t104xrdb/spl.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <console.h> #include <env_internal.h> +#include <init.h> #include <malloc.h> #include <ns16550.h> #include <nand.h>
board/freescale/t208xqds/spl.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <console.h> #include <env_internal.h> +#include <init.h> #include <malloc.h> #include <ns16550.h> #include <nand.h>
board/freescale/t208xrdb/spl.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <console.h> #include <env_internal.h> +#include <init.h> #include <malloc.h> #include <ns16550.h> #include <nand.h>
board/freescale/t4qds/spl.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <console.h> #include <env_internal.h> +#include <init.h> #include <asm/spl.h> #include <malloc.h> #include <ns16550.h>
board/freescale/t4rdb/spl.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <console.h> #include <env_internal.h> +#include <init.h> #include <asm/spl.h> #include <malloc.h> #include <ns16550.h>
include/common.h +0 -6
@@ -103,12 +103,6 @@ void fdc_hw_init (void);int testdram (void );#endif /* CONFIG_SYS_DRAM_TEST */ -#if defined(CONFIG_ARM ) -void relocate_code (ulong ); -#else -void relocate_code (ulong ,gd_t *,ulong ) __attribute__ ((noreturn)); -#endif -void s_init (void );void upmconfig (unsigned int ,unsigned int *,unsigned int );
include/init.h +10 -0
@@ -12,6 +12,8 @@#include <linux/types.h> +struct global_data ; +#ifndef __ASSEMBLY__/* put C only stuff in this section */ /*
@@ -228,6 +230,14 @@ void trap_init(unsigned long reloc_addr);*/ void main_loop (void ); +#if defined(CONFIG_ARM ) +void relocate_code (ulong addr_moni); +#else +void relocate_code (ulong start_addr_sp,struct global_data *new_gd, +ulong relocaddr) + __attribute__ ((noreturn)); +#endif +#endif /* __ASSEMBLY__ */ /* Put only stuff here that the assembler can digest */
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 8/35 common: Move relocate_code() to init.h
Quoted 6 lines · Simon Glass
This is an init function so move it out of the common header. Avoid using the typedef so that we don't have to include the
global_dataheader file.Also tidy up the function style in comments while we are here.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/35b32ba4/attachment.sig>
PATCH v2 9/35 common: Move jumptable_init() out of common.h
In reply to Simon GlassThis function is defined in exports.c so move it to its header file.
---
Changes in v2: None
common/board_r.c | 1 + include/common.h | 3 --- include/exports.h | 3 +++ 3 files changed, 4 insertions(+), 3 deletions(-)
common/board_r.c +1 -0
@@ -12,6 +12,7 @@#include <common.h> #include <api.h> #include <cpu_func.h> +#include <exports.h> #include <irq_func.h> #include <u-boot/crc.h> /* TODO: can we just include all these headers whether needed or not? */
include/common.h +0 -3
@@ -81,9 +81,6 @@ extern ulong load_addr; /* Default Load Address */extern ulong save_addr;/* Default Save Address */ extern ulong save_size;/* Default Save Size */ -/* common/exports.c */ -void jumptable_init (void ); -/* common/kallsysm.c */ const char *symbol_lookup (unsigned long addr,unsigned long *caddr);
include/exports.h +3 -0
@@ -13,6 +13,9 @@struct spi_slave ; +/* Set up the jump table for use by the API */ +void jumptable_init (void ); +/* These are declarations of exported functions available in C code */ unsigned long get_version (void );int getc (void );
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 9/35 common: Move jumptable_init() out of common.h
Quoted 4 lines · Simon Glass
This function is defined in
exports.cso move it to its header file.Signed-off-by Simon Glass <[email protected]>Reviewed-by Heinrich Schuchardt <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/24953ea6/attachment.sig>
PATCH v2 10/35 common: Drop floppy disk support
In reply to Simon GlassThis seems pretty old now. It has not been converted to driver model and is not used by any boards.
Drop it.
---
Changes in v2: None
README | 26 -- cmd/Kconfig | 5 - cmd/Makefile | 1 - cmd/fdc.c | 752 -------------------------------- drivers/misc/Makefile | 1 - drivers/misc/ns87308.c | 100 ----- drivers/serial/serial_ns16550.c | 7 +- include/common.h | 1 - include/ns87308.h | 233 ---------- scripts/config_whitelist.txt | 34 -- 10 files changed, 1 insertion(+), 1159 deletions(-) delete mode 100644 cmd/fdc.c delete mode 100644 drivers/misc/ns87308.c delete mode 100644 include/ns87308.h
README +0 -26
@@ -2870,32 +2870,6 @@ Low Level (hardware related) configuration options: If this macro is defined, then CONFIG_SYS_CCSRBAR_PHYS will be forced to a value that ensures that CCSR is not relocated. -- Floppy Disk Support: - CONFIG_SYS_FDC_DRIVE_NUMBER - - the default drive number (default value 0) - - CONFIG_SYS_ISA_IO_STRIDE - - defines the spacing between FDC chipset registers - (default value 1) - - CONFIG_SYS_ISA_IO_OFFSET - - defines the offset of register from address. It - depends on which part of the data bus is connected to - the FDC chipset. (default value 0) - - If CONFIG_SYS_ISA_IO_STRIDE CONFIG_SYS_ISA_IO_OFFSET and - CONFIG_SYS_FDC_DRIVE_NUMBER are undefined, they take their - default value. - - if CONFIG_SYS_FDC_HW_INIT is defined, then the function - fdc_hw_init() is called at the beginning of the FDC - setup. fdc_hw_init() must be provided by the board - source code. It is used to make hardware-dependent - initializations. - - CONFIG_IDE_AHB: Most IDE controllers were designed to be connected with PCI interface. Only few of them were designed for AHB interface.
cmd/Kconfig +0 -5
@@ -850,11 +850,6 @@ config CMD_FASTBOOT See doc/android/fastboot.txt for more information. -config CMD_FDC - bool "fdcboot - Boot from floppy device" - help - The 'fdtboot' command allows booting an image from a floppy disk. - config CMD_FLASH bool "flinfo, erase, protect" default y
cmd/Makefile +0 -1
@@ -58,7 +58,6 @@ obj-$(CONFIG_HUSH_PARSER) += exit.o obj-$(CONFIG_CMD_EXT4) += ext4.o obj-$(CONFIG_CMD_EXT2) += ext2.o obj-$(CONFIG_CMD_FAT) += fat.o -obj-$(CONFIG_CMD_FDC) += fdc.o obj-$(CONFIG_CMD_FDT) += fdt.o obj-$(CONFIG_CMD_FITUPD) += fitupd.o obj-$(CONFIG_CMD_FLASH) += flash.o
cmd/fdc.c deleted +0 -752
752 lines not on this page · raw message
drivers/misc/Makefile +0 -1
@@ -51,7 +51,6 @@ obj-$(CONFIG_LED_STATUS_GPIO) += gpio_led.o obj-$(CONFIG_MPC83XX_SERDES) += mpc83xx_serdes.o obj-$(CONFIG_MXC_OCOTP) += mxc_ocotp.o obj-$(CONFIG_MXS_OCOTP) += mxs_ocotp.o -obj-$(CONFIG_NS87308) += ns87308.o obj-$(CONFIG_NUVOTON_NCT6102D) += nuvoton_nct6102d.o obj-$(CONFIG_P2SB) += p2sb-uclass.o obj-$(CONFIG_PCA9551_LED) += pca9551_led.o
drivers/misc/ns87308.c deleted +0 -100
100 lines not on this page · raw message
drivers/serial/serial_ns16550.c +1 -6
@@ -5,14 +5,9 @@*/ #include <common.h> -#include <linux/compiler.h> -#include <ns16550.h> -#ifdef CONFIG_NS87308 -#include <ns87308.h> -#endif -#include <serial.h> +#include <linux/compiler.h> #ifndef CONFIG_NS16550_MIN_FUNCTIONS
include/common.h +0 -1
@@ -90,7 +90,6 @@ phys_size_t get_effective_memsize(void);/* $(BOARD)/$(BOARD).c */ void reset_phy (void ); -void fdc_hw_init (void );#if !defined(CONFIG_ENV_EEPROM_IS_ON_I2C ) && defined(CONFIG_SYS_I2C_EEPROM_ADDR )# define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR
include/ns87308.h deleted +0 -233
233 lines not on this page · raw message
scripts/config_whitelist.txt +0 -34
@@ -1241,7 +1241,6 @@ CONFIG_NO_WAIT CONFIG_NR_DRAM_POPULATED CONFIG_NS16550_MIN_FUNCTIONS CONFIG_NS8382X -CONFIG_NS87308 CONFIG_NUM_DSP_CPUS CONFIG_NUM_PAMU CONFIG_ODROID_REV_AIN
@@ -2296,8 +2295,6 @@ CONFIG_SYS_FAST_CLK CONFIG_SYS_FAULT_ECHO_LINK_DOWN CONFIG_SYS_FAULT_MII_ADDR CONFIG_SYS_FCC_PSMR -CONFIG_SYS_FDC_DRIVE_NUMBER -CONFIG_SYS_FDC_HW_INIT CONFIG_SYS_FDT_BASE CONFIG_SYS_FDT_LOAD_ADDR CONFIG_SYS_FDT_PAD
@@ -2972,8 +2969,6 @@ CONFIG_SYS_IO_BASE CONFIG_SYS_ISA_BASE CONFIG_SYS_ISA_IO CONFIG_SYS_ISA_IO_BASE_ADDRESS -CONFIG_SYS_ISA_IO_OFFSET -CONFIG_SYS_ISA_IO_STRIDE CONFIG_SYS_ISA_MEM CONFIG_SYS_JFFS2_FIRST_BANK CONFIG_SYS_JFFS2_FIRST_SECTOR
@@ -3333,35 +3328,6 @@ CONFIG_SYS_NS16550_MEM32 CONFIG_SYS_NS16550_PORT_MAPPED CONFIG_SYS_NS16550_REG_SIZE CONFIG_SYS_NS16550_SERIAL -CONFIG_SYS_NS87308_CS0_BASE -CONFIG_SYS_NS87308_CS0_CONF -CONFIG_SYS_NS87308_CS1_BASE -CONFIG_SYS_NS87308_CS1_CONF -CONFIG_SYS_NS87308_CS2_BASE -CONFIG_SYS_NS87308_CS2_CONF -CONFIG_SYS_NS87308_FDC -CONFIG_SYS_NS87308_FDC_BASE -CONFIG_SYS_NS87308_GPIO -CONFIG_SYS_NS87308_GPIO_BASE -CONFIG_SYS_NS87308_KBC1 -CONFIG_SYS_NS87308_KBC1_BASE -CONFIG_SYS_NS87308_KBC2 -CONFIG_SYS_NS87308_LPT_BASE -CONFIG_SYS_NS87308_MOUSE -CONFIG_SYS_NS87308_PARP -CONFIG_SYS_NS87308_PMC1 -CONFIG_SYS_NS87308_PMC2 -CONFIG_SYS_NS87308_PMC3 -CONFIG_SYS_NS87308_POWRMAN -CONFIG_SYS_NS87308_PS2MOD -CONFIG_SYS_NS87308_PWMAN_BASE -CONFIG_SYS_NS87308_RARP -CONFIG_SYS_NS87308_RTC_APC -CONFIG_SYS_NS87308_RTC_BASE -CONFIG_SYS_NS87308_UART1 -CONFIG_SYS_NS87308_UART1_BASE -CONFIG_SYS_NS87308_UART2 -CONFIG_SYS_NS87308_UART2_BASE CONFIG_SYS_NUM_ADDR_MAP CONFIG_SYS_NUM_CPC CONFIG_SYS_NUM_FM1_10GEC
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 10/35 common: Drop floppy disk support
Quoted 6 lines · Simon Glass
This seems pretty old now. It has not been converted to driver model and is not used by any boards.
Drop it.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/6161d0de/attachment.sig>
PATCH v2 11/35 common: Move reset_phy() to net.h
In reply to Simon GlassThis is a network function so let's move it into that header.
---
Changes in v2: None
arch/arm/mach-omap2/emif-common.c | 1 + board/LaCie/edminiv2/edminiv2.c | 1 + board/LaCie/net2big_v2/net2big_v2.c | 1 + board/LaCie/netspace_v2/netspace_v2.c | 1 + board/Marvell/db-88f6281-bp/db-88f6281-bp.c | 1 + board/Marvell/dreamplug/dreamplug.c | 1 + board/Marvell/guruplug/guruplug.c | 1 + board/Marvell/openrd/openrd.c | 1 + board/Marvell/sheevaplug/sheevaplug.c | 1 + board/Seagate/dockstar/dockstar.c | 1 + board/Seagate/goflexhome/goflexhome.c | 1 + board/Seagate/nas220/nas220.c | 1 + board/Synology/ds109/ds109.c | 1 + board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c | 1 + board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c | 1 + board/atmel/at91sam9260ek/at91sam9260ek.c | 1 + board/atmel/at91sam9263ek/at91sam9263ek.c | 1 + board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 1 + board/cloudengines/pogo_e02/pogo_e02.c | 1 + board/d-link/dns325/dns325.c | 1 + board/freescale/ls1012afrdm/eth.c | 1 + board/freescale/ls1012ardb/eth.c | 1 + board/freescale/ls1088a/eth_ls1088aqds.c | 1 + board/freescale/ls1088a/eth_ls1088ardb.c | 1 + board/freescale/ls2080a/ls2080a.c | 1 + board/freescale/ls2080aqds/eth.c | 1 + board/freescale/ls2080ardb/eth_ls2080rdb.c | 1 + board/freescale/lx2160a/eth_lx2160aqds.c | 1 + board/freescale/lx2160a/eth_lx2160ardb.c | 1 + board/keymile/km_arm/km_arm.c | 1 + board/zyxel/nsa310s/nsa310s.c | 1 + common/board_r.c | 1 + include/common.h | 3 --- include/net.h | 8 ++++++++ 34 files changed, 40 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/emif-common.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <net.h> #include <asm/emif.h> #include <asm/arch/clock.h> #include <asm/arch/sys_proto.h>
board/LaCie/edminiv2/edminiv2.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <miiphy.h> +#include <net.h> #include <asm/arch/orion5x.h> #include "../common/common.h" #include <spl.h>
board/LaCie/net2big_v2/net2big_v2.c +1 -0
@@ -12,6 +12,7 @@#include <command.h> #include <env.h> #include <i2c.h> +#include <net.h> #include <asm/mach-types.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h>
board/LaCie/netspace_v2/netspace_v2.c +1 -0
@@ -11,6 +11,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <net.h> #include <asm/mach-types.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h>
board/Marvell/db-88f6281-bp/db-88f6281-bp.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ #include <common.h> +#include <net.h> #include <linux/io.h> #include <miiphy.h> #include <netdev.h>
board/Marvell/dreamplug/dreamplug.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <miiphy.h> +#include <net.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h> #include <asm/arch/mpp.h>
board/Marvell/guruplug/guruplug.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <miiphy.h> +#include <net.h> #include <asm/mach-types.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h>
board/Marvell/openrd/openrd.c +1 -0
@@ -12,6 +12,7 @@#include <common.h> #include <miiphy.h> +#include <net.h> #include <asm/mach-types.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h>
board/Marvell/sheevaplug/sheevaplug.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <miiphy.h> +#include <net.h> #include <asm/mach-types.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h>
board/Seagate/dockstar/dockstar.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <miiphy.h> +#include <net.h> #include <asm/arch/soc.h> #include <asm/arch/mpp.h> #include <asm/arch/cpu.h>
board/Seagate/goflexhome/goflexhome.c +1 -0
@@ -13,6 +13,7 @@#include <common.h> #include <miiphy.h> +#include <net.h> #include <asm/mach-types.h> #include <asm/arch/soc.h> #include <asm/arch/mpp.h>
board/Seagate/nas220/nas220.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <miiphy.h> +#include <net.h> #include <asm/mach-types.h> #include <asm/arch/soc.h> #include <asm/arch/mpp.h>
board/Synology/ds109/ds109.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <miiphy.h> +#include <net.h> #include <asm/setup.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h>
board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <net.h> #include <linux/io.h> #include <miiphy.h> #include <netdev.h>
board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <miiphy.h> +#include <net.h> #include <netdev.h> #include <led.h> #include <linux/io.h>
board/atmel/at91sam9260ek/at91sam9260ek.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <debug_uart.h> +#include <net.h> #include <asm/io.h> #include <asm/arch/at91sam9260_matrix.h> #include <asm/arch/at91sam9_smc.h>
board/atmel/at91sam9263ek/at91sam9263ek.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <debug_uart.h> +#include <net.h> #include <vsprintf.h> #include <linux/sizes.h> #include <asm/arch/at91sam9263.h>
board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <debug_uart.h> +#include <net.h> #include <vsprintf.h> #include <asm/io.h> #include <asm/arch/clk.h>
board/cloudengines/pogo_e02/pogo_e02.c +1 -0
@@ -11,6 +11,7 @@#include <common.h> #include <miiphy.h> +#include <net.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h> #include <asm/arch/mpp.h>
board/d-link/dns325/dns325.c +1 -0
@@ -11,6 +11,7 @@#include <common.h> #include <miiphy.h> +#include <net.h> #include <netdev.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h>
board/freescale/ls1012afrdm/eth.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <dm.h> +#include <net.h> #include <asm/io.h> #include <netdev.h> #include <fm_eth.h>
board/freescale/ls1012ardb/eth.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <dm.h> +#include <net.h> #include <asm/io.h> #include <netdev.h> #include <fm_eth.h>
board/freescale/ls1088a/eth_ls1088aqds.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <net.h> #include <netdev.h> #include <asm/io.h> #include <asm/arch/fsl_serdes.h>
board/freescale/ls1088a/eth_ls1088ardb.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <command.h> +#include <net.h> #include <netdev.h> #include <malloc.h> #include <fsl_mdio.h>
board/freescale/ls2080a/ls2080a.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <malloc.h> #include <errno.h> +#include <net.h> #include <netdev.h> #include <fsl_ifc.h> #include <fsl_ddr.h>
board/freescale/ls2080aqds/eth.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <env.h> +#include <net.h> #include <netdev.h> #include <asm/io.h> #include <asm/arch/fsl_serdes.h>
board/freescale/ls2080ardb/eth_ls2080rdb.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> +#include <net.h> #include <netdev.h> #include <malloc.h> #include <fsl_mdio.h>
board/freescale/lx2160a/eth_lx2160aqds.c +1 -0
@@ -8,6 +8,7 @@#include <env.h> #include <hwconfig.h> #include <command.h> +#include <net.h> #include <netdev.h> #include <malloc.h> #include <fsl_mdio.h>
board/freescale/lx2160a/eth_lx2160ardb.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> +#include <net.h> #include <netdev.h> #include <malloc.h> #include <fsl_mdio.h>
board/keymile/km_arm/km_arm.c +1 -0
@@ -16,6 +16,7 @@#include <i2c.h> #include <init.h> #include <nand.h> +#include <net.h> #include <netdev.h> #include <miiphy.h> #include <spi.h>
board/zyxel/nsa310s/nsa310s.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <miiphy.h> +#include <net.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h> #include <asm/arch/mpp.h>
common/board_r.c +1 -0
@@ -14,6 +14,7 @@#include <cpu_func.h> #include <exports.h> #include <irq_func.h> +#include <net.h> #include <u-boot/crc.h> /* TODO: can we just include all these headers whether needed or not? */ #if defined(CONFIG_CMD_BEDBUG )
include/common.h +0 -3
@@ -88,9 +88,6 @@ const char *symbol_lookup(unsigned long addr, unsigned long *caddr);long get_ram_size (long *,long );phys_size_t get_effective_memsize (void ); -/* $(BOARD)/$(BOARD).c */ -void reset_phy (void ); -#if !defined(CONFIG_ENV_EEPROM_IS_ON_I2C ) && defined(CONFIG_SYS_I2C_EEPROM_ADDR )# define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR#endif
include/net.h +8 -0
@@ -917,4 +917,12 @@ static inline struct in_addr env_get_ip(char *var) {return string_to_ip (env_get (var)); } + +/** +* reset_phy() - Reset the Ethernet PHY +* +* This should be implemented by boards if CONFIG_RESET_PHY_R is enabled +*/ +void reset_phy (void ); +#endif /* __NET_H__ */
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 11/35 common: Move reset_phy() to net.h
Quoted 3 lines · Simon Glass
This is a network function so let's move it into that header.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/fd18f3d9/attachment.sig>
PATCH v2 12/35 common: Move CONFIG_SYS_DEF_EEPROM_ADDR out of common.h
In reply to Simon GlassThis define seems better suited to the eeprom header file, particularly as it is only used in the eeprom.c file.
Move it.
---
Changes in v2: None
include/common.h | 4 ---- include/eeprom.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-)
include/common.h +0 -4
@@ -88,10 +88,6 @@ const char *symbol_lookup(unsigned long addr, unsigned long *caddr);long get_ram_size (long *,long );phys_size_t get_effective_memsize (void ); -#if !defined(CONFIG_ENV_EEPROM_IS_ON_I2C ) && defined(CONFIG_SYS_I2C_EEPROM_ADDR ) -# define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR -#endif -#if defined(CONFIG_SYS_DRAM_TEST )int testdram (void );#endif /* CONFIG_SYS_DRAM_TEST */
include/eeprom.h +4 -0
@@ -21,4 +21,8 @@ int eeprom_write(uint dev_addr, uint offset, uchar *buffer, uint cnt);#define eeprom_write (dev_addr, offset, buffer, cnt) ((void)-ENOSYS)#endif +#if !defined(CONFIG_ENV_EEPROM_IS_ON_I2C ) && defined(CONFIG_SYS_I2C_EEPROM_ADDR ) +# define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR +#endif +#endif
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 12/35 common: Move CONFIG_SYS_DEF_EEPROM_ADDR out of common.h
Quoted 6 lines · Simon Glass
This define seems better suited to the eeprom header file, particularly as it is only used in the
eeprom.cfile.Move it.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/933e93d8/attachment.sig>
PATCH v2 13/35 common: Drop CONFIG_POST_STD/ALT_LIST
In reply to Simon GlassThese CONFIG options are not used anymore. CONFIG_POST_ALT_LIST just causes CONFIG_POST_STD_LIST to be set and it causes tests.c to be compiled. So just make compiling tests.c unconditional.
---
Changes in v2: None
include/common.h | 3 --- post/Makefile | 2 +- scripts/config_whitelist.txt | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-)
include/common.h +0 -3
@@ -125,9 +125,6 @@ int get_serial_clock(void);#ifdef CONFIG_POST #define CONFIG_HAS_POST -#ifndef CONFIG_POST_ALT_LIST -#define CONFIG_POST_STD_LIST -#endif #endif #define ROUND (a,b) (((a) + (b) - 1) & ~((b) - 1))
post/Makefile +1 -1
@@ -4,7 +4,7 @@ # Wolfgang Denk, DENX Software Engineering, wd at denx.de. obj-y += post.o -obj-$(CONFIG_POST_STD_LIST) += tests.o +obj-y += tests.o obj-y += drivers/ obj-$(CONFIG_PPC) += lib_powerpc/
scripts/config_whitelist.txt +0 -2
@@ -1352,7 +1352,6 @@ CONFIG_PMW_BASE CONFIG_PM_SLEEP CONFIG_POST CONFIG_POSTBOOTMENU -CONFIG_POST_ALT_LIST CONFIG_POST_BSPEC1 CONFIG_POST_BSPEC2 CONFIG_POST_BSPEC3
@@ -1360,7 +1359,6 @@ CONFIG_POST_BSPEC4 CONFIG_POST_BSPEC5 CONFIG_POST_EXTERNAL_WORD_FUNCS CONFIG_POST_SKIP_ENV_FLAGS -CONFIG_POST_STD_LIST CONFIG_POST_UART CONFIG_POST_WATCHDOG CONFIG_POWER
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 13/35 common: Drop CONFIG_POST_STD/ALT_LIST
Quoted 5 lines · Simon Glass
These CONFIG options are not used anymore.
CONFIG_POST_ALT_LISTjust causesCONFIG_POST_STD_LISTto be set and it causestests.cto be compiled. So just make compilingtests.cunconditional.Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/77f1edea/attachment.sig>
PATCH v2 14/35 common: Drop CONFIG_HAS_POST
In reply to Simon GlassThis only exists to control whether the post/ directory is build. It is just as easy to check this in the Makefile. Remove CONFIG_HAS_POST and use an ifdef in the Makefile instead.
---
Changes in v2: None
Makefile | 4 +++- include/common.h | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-)
Makefile +3 -1
@@ -762,7 +762,9 @@ libs-y += cmd/ libs-y += common/ libs-y += env/ libs-$(CONFIG_API) += api/ -libs-$(CONFIG_HAS_POST) += post/ +ifdef CONFIG_POST +libs-y += post/ +endif libs-$(CONFIG_UNIT_TEST) += test/ test/dm/ libs-$(CONFIG_UT_ENV) += test/env/ libs-$(CONFIG_UT_OPTEE) += test/optee/
include/common.h +0 -4
@@ -123,10 +123,6 @@ int get_serial_clock(void);/* Put only stuff here that the assembler can digest */ -#ifdef CONFIG_POST -#define CONFIG_HAS_POST -#endif -#define ROUND (a,b) (((a) + (b) - 1) & ~((b) - 1))/*
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 14/35 common: Drop CONFIG_HAS_POST
Quoted 5 lines · Simon Glass
This only exists to control whether the post/ directory is build. It is just as easy to check this in the
Makefile. RemoveCONFIG_HAS_POSTand use an ifdef in theMakefileinstead.Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/fc6c5af3/attachment.sig>
PATCH v2 15/35 common: Drop the symbol_lookup() declaration
In reply to Simon GlassThis function is not called anywhere so we can drop the declaration. If it is needed one day, it should be added in its own header file.
---
Changes in v2: None
include/common.h | 3 --- 1 file changed, 3 deletions(-)
include/common.h +0 -3
@@ -81,9 +81,6 @@ extern ulong load_addr; /* Default Load Address */extern ulong save_addr;/* Default Save Address */ extern ulong save_size;/* Default Save Size */ -/* common/kallsysm.c */ -const char *symbol_lookup (unsigned long addr,unsigned long *caddr); -/* common/memsize.c */ long get_ram_size (long *,long );phys_size_t get_effective_memsize (void );
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 15/35 common: Drop the symbol_lookup() declaration
Quoted 4 lines · Simon Glass
This function is not called anywhere so we can drop the declaration. If it is needed one day, it should be added in its own header file.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/d9b9357f/attachment.sig>
PATCH v2 16/35 common: Move type declarations to linux/types.h
In reply to Simon GlassThis file already has lots of type declarations so it seems better to put all of them there.
Move them.
---
Changes in v2:
- Drop duplicate uchar in linux/types.h
include/common.h | 5 ----- include/linux/types.h | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-)
include/common.h +0 -5
@@ -15,11 +15,6 @@#ifndef __ASSEMBLY__/* put C only stuff in this section */ -typedef unsigned char uchar ; -typedef volatile unsigned long vu_long ; -typedef volatile unsigned short vu_short ; -typedef volatile unsigned char vu_char ; -#include <config.h> #include <errno.h> #include <time.h>
include/linux/types.h +4 -0
@@ -163,4 +163,8 @@ struct ustat {#define DECLARE_BITMAP (name, bits) \ unsigned long name[BITS_TO_LONGS(bits)] +typedef volatile unsigned long vu_long ; +typedef volatile unsigned short vu_short ; +typedef volatile unsigned char vu_char ; +#endif /* _LINUX_TYPES_H */
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 16/35 common: Move type declarations to linux/types.h
Quoted 6 lines · Simon Glass
This file already has lots of type declarations so it seems better to put all of them there.
Move them.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/3aa58030/attachment.sig>
PATCH v2 17/35 common: Move device-tree setup functions to fdt_support.h
In reply to Simon GlassThese functions relate to setting up the device tree for booting the OS. The fdt_support.h header file supports similar functions, so move these there.
---
Changes in v2: None
arch/riscv/lib/bootm.c | 1 + board/esd/vme8349/vme8349.c | 1 + board/freescale/b4860qds/b4860qds.c | 1 + board/freescale/corenet_ds/corenet_ds.c | 1 + board/freescale/ls1012afrdm/ls1012afrdm.c | 1 + board/freescale/ls1012ardb/ls1012ardb.c | 1 + board/freescale/ls1021aiot/ls1021aiot.c | 1 + board/freescale/ls1021aqds/ls1021aqds.c | 1 + board/freescale/ls1021atsn/ls1021atsn.c | 1 + board/freescale/ls1021atwr/ls1021atwr.c | 1 + board/freescale/mpc8313erdb/mpc8313erdb.c | 1 + board/freescale/mpc8323erdb/mpc8323erdb.c | 1 + board/freescale/mpc832xemds/mpc832xemds.c | 1 + board/freescale/mpc8349emds/mpc8349emds.c | 1 + board/freescale/mpc8349itx/mpc8349itx.c | 1 + board/freescale/p2041rdb/p2041rdb.c | 1 + board/freescale/t102xqds/t102xqds.c | 1 + board/freescale/t102xrdb/t102xrdb.c | 1 + board/freescale/t1040qds/t1040qds.c | 1 + board/freescale/t104xrdb/t104xrdb.c | 1 + board/freescale/t208xqds/t208xqds.c | 1 + board/freescale/t208xrdb/t208xrdb.c | 1 + board/freescale/t4qds/t4240emu.c | 1 + board/freescale/t4qds/t4240qds.c | 1 + board/freescale/t4rdb/t4240rdb.c | 1 + board/hisilicon/hikey/hikey.c | 1 + board/ids/ids8313/ids8313.c | 1 + board/keymile/km83xx/km83xx.c | 1 + board/keymile/kmp204x/kmp204x.c | 1 + board/sbc8349/sbc8349.c | 1 + board/ti/am43xx/board.c | 1 + board/ti/am57xx/board.c | 1 + board/ti/dra7xx/evm.c | 1 + board/tqc/tqm834x/tqm834x.c | 1 + board/varisys/cyrus/cyrus.c | 1 + board/ve8313/ve8313.c | 1 + include/common.h | 12 ------------ include/fdt_support.h | 14 ++++++++++++++ 38 files changed, 50 insertions(+), 12 deletions(-)
arch/riscv/lib/bootm.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <command.h> #include <dm.h> +#include <fdt_support.h> #include <dm/root.h> #include <image.h> #include <asm/byteorder.h>
board/esd/vme8349/vme8349.c +1 -0
@@ -12,6 +12,7 @@*/ #include <common.h> +#include <fdt_support.h> #include <ioports.h> #include <mpc83xx.h> #include <asm/mpc8349_pci.h>
board/freescale/b4860qds/b4860qds.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <fdt_support.h> #include <i2c.h> #include <init.h> #include <irq_func.h>
board/freescale/corenet_ds/corenet_ds.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <fdt_support.h> #include <init.h> #include <netdev.h> #include <linux/compiler.h>
board/freescale/ls1012afrdm/ls1012afrdm.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <fdt_support.h> #include <i2c.h> #include <asm/io.h> #include <asm/arch/clock.h>
board/freescale/ls1012ardb/ls1012ardb.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <fdt_support.h> #include <i2c.h> #include <asm/io.h> #include <asm/arch/clock.h>
board/freescale/ls1021aiot/ls1021aiot.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <fdt_support.h> #include <init.h> #include <asm/arch/immap_ls102xa.h> #include <asm/arch/clock.h>
board/freescale/ls1021aqds/ls1021aqds.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <fdt_support.h> #include <i2c.h> #include <init.h> #include <asm/io.h>
board/freescale/ls1021atsn/ls1021atsn.c +1 -0
@@ -2,6 +2,7 @@/* Copyright 2016-2019 NXP Semiconductors */ #include <common.h> +#include <fdt_support.h> #include <init.h> #include <asm/arch-ls102xa/ls102xa_soc.h> #include <asm/arch/ls102xa_devdis.h>
board/freescale/ls1021atwr/ls1021atwr.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <fdt_support.h> #include <i2c.h> #include <init.h> #include <asm/io.h>
board/freescale/mpc8313erdb/mpc8313erdb.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <fdt_support.h> #include <init.h> #if defined(CONFIG_OF_LIBFDT )#include <linux/libfdt.h>
board/freescale/mpc8323erdb/mpc8323erdb.c +1 -0
@@ -12,6 +12,7 @@#include <common.h> #include <eeprom.h> #include <env.h> +#include <fdt_support.h> #include <init.h> #include <ioports.h> #include <mpc83xx.h>
board/freescale/mpc832xemds/mpc832xemds.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <fdt_support.h> #include <init.h> #include <ioports.h> #include <mpc83xx.h>
board/freescale/mpc8349emds/mpc8349emds.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <fdt_support.h> #include <ioports.h> #include <mpc83xx.h> #include <asm/mpc8349_pci.h>
board/freescale/mpc8349itx/mpc8349itx.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <fdt_support.h> #include <ioports.h> #include <mpc83xx.h> #include <i2c.h>
board/freescale/p2041rdb/p2041rdb.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <fdt_support.h> #include <init.h> #include <netdev.h> #include <linux/compiler.h>
board/freescale/t102xqds/t102xqds.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <fdt_support.h> #include <i2c.h> #include <init.h> #include <netdev.h>
board/freescale/t102xrdb/t102xrdb.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <fdt_support.h> #include <i2c.h> #include <init.h> #include <netdev.h>
board/freescale/t1040qds/t1040qds.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <fdt_support.h> #include <i2c.h> #include <init.h> #include <netdev.h>
board/freescale/t104xrdb/t104xrdb.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <fdt_support.h> #include <hwconfig.h> #include <init.h> #include <netdev.h>
board/freescale/t208xqds/t208xqds.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <fdt_support.h> #include <i2c.h> #include <init.h> #include <netdev.h>
board/freescale/t208xrdb/t208xrdb.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <fdt_support.h> #include <i2c.h> #include <init.h> #include <netdev.h>
board/freescale/t4qds/t4240emu.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <fdt_support.h> #include <i2c.h> #include <init.h> #include <netdev.h>
board/freescale/t4qds/t4240qds.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <fdt_support.h> #include <i2c.h> #include <init.h> #include <irq_func.h>
board/freescale/t4rdb/t4240rdb.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <fdt_support.h> #include <i2c.h> #include <init.h> #include <netdev.h>
board/hisilicon/hikey/hikey.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> #include <dm.h> +#include <fdt_support.h> #include <dm/platform_data/serial_pl01x.h> #include <errno.h> #include <malloc.h>
board/ids/ids8313/ids8313.c +1 -0
@@ -12,6 +12,7 @@*/ #include <common.h> +#include <fdt_support.h> #include <mpc83xx.h> #include <spi.h> #include <linux/libfdt.h>
board/keymile/km83xx/km83xx.c +1 -0
@@ -15,6 +15,7 @@#include <common.h> #include <env.h> +#include <fdt_support.h> #include <init.h> #include <ioports.h> #include <mpc83xx.h>
board/keymile/kmp204x/kmp204x.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <fdt_support.h> #include <init.h> #include <netdev.h> #include <linux/compiler.h>
board/sbc8349/sbc8349.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <fdt_support.h> #include <ioports.h> #include <mpc83xx.h> #include <asm/mpc8349_pci.h>
board/ti/am43xx/board.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <eeprom.h> #include <env.h> +#include <fdt_support.h> #include <i2c.h> #include <init.h> #include <linux/errno.h>
board/ti/am57xx/board.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <env.h> +#include <fdt_support.h> #include <init.h> #include <palmas.h> #include <sata.h>
board/ti/dra7xx/evm.c +1 -0
@@ -11,6 +11,7 @@*/ #include <common.h> #include <env.h> +#include <fdt_support.h> #include <init.h> #include <palmas.h> #include <sata.h>
board/tqc/tqm834x/tqm834x.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <fdt_support.h> #include <ioports.h> #include <mpc83xx.h> #include <asm/mpc8349_pci.h>
board/varisys/cyrus/cyrus.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <fdt_support.h> #include <init.h> #include <netdev.h> #include <linux/compiler.h>
board/ve8313/ve8313.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <fdt_support.h> #include <init.h> #include <linux/libfdt.h> #include <pci.h>
include/common.h +0 -12
@@ -59,16 +59,6 @@ void hang (void) __attribute__ ((noreturn));#include <display_options.h> -/** -* arch_fixup_fdt() - Write arch-specific information to fdt -* -* Defined in arch/$(ARCH)/lib/bootm-fdt.c -* -* @blob: FDT blob to write to -* @return 0 if ok, or -ve FDT_ERR_... on failure -*/ -int arch_fixup_fdt (void *blob); -/* common/cmd_source.c */ int source (ulong addr,const char *fit_uname);
@@ -90,8 +80,6 @@ void upmconfig (unsigned int, unsigned int *, unsigned int);ulong get_tbclk (void );void reset_misc (void );void reset_cpu (ulong addr); -void ft_cpu_setup (void *blob,bd_t *bd); -void ft_pci_setup (void *blob,bd_t *bd);/* $(CPU)/speed.c */ int get_clocks (void );
include/fdt_support.h +14 -0
@@ -11,6 +11,20 @@#include <linux/libfdt.h> +/** +* arch_fixup_fdt() - Write arch-specific information to fdt +* +* Defined in arch/$(ARCH)/lib/bootm-fdt.c +* +* @blob: FDT blob to write to +* @return 0 if ok, or -ve FDT_ERR_... on failure +*/ +int arch_fixup_fdt (void *blob); + +void ft_cpu_setup (void *blob,bd_t *bd); + +void ft_pci_setup (void *blob,bd_t *bd); +u32 fdt_getprop_u32_default_node (const void *fdt,int off,int cell,const char *prop,const u32 dflt); u32 fdt_getprop_u32_default(const void *fdt, const char *path,
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 17/35 common: Move device-tree setup functions to fdt_support.h
Quoted 5 lines · Simon Glass
These functions relate to setting up the device tree for booting the OS. The
fdt_support.hheader file supports similar functions, so move these there.Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/41294c6b/attachment.sig>
PATCH v2 18/35 common: arm: Move s_init() to an ARM-specific header
In reply to Simon GlassThis function is only used on ARM devices so does not belong in the global common header file. Move it to an ARM header.
---
Changes in v2: None
arch/arm/include/asm/u-boot-arm.h | 2 ++ include/common.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/include/asm/u-boot-arm.h +2 -0
@@ -23,6 +23,8 @@ extern ulong _datarellocal_start_ofs;extern ulong _datarelro_start_ofs;extern ulong IRQ_STACK_START_IN ;/* 8 bytes in IRQ stack */ +void s_init (void ); +/* cpu/.../cpu.c */ int cleanup_before_linux (void );
include/common.h +0 -2
@@ -74,8 +74,6 @@ phys_size_t get_effective_memsize(void);int testdram (void );#endif /* CONFIG_SYS_DRAM_TEST */ -void s_init (void ); -void upmconfig (unsigned int ,unsigned int *,unsigned int );ulong get_tbclk (void );void reset_misc (void );
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 18/35 common: arm: Move s_init() to an ARM-specific header
Quoted 4 lines · Simon Glass
This function is only used on ARM devices so does not belong in the global common header file. Move it to an ARM header.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/bc93f488/attachment.sig>
PATCH v2 19/35 common: Move ll_boot_init() to init.h
In reply to Simon GlassThis is an init-related function so belongs in that file. Move it.
---
Changes in v2: None
arch/x86/cpu/baytrail/cpu.c | 1 + arch/x86/cpu/baytrail/valleyview.c | 1 + arch/x86/cpu/cpu.c | 1 + arch/x86/cpu/i386/cpu.c | 1 + arch/x86/cpu/i386/interrupt.c | 1 + drivers/pci/pci_rom.c | 1 + drivers/video/broadwell_igd.c | 1 + include/common.h | 7 ------- include/init.h | 7 +++++++ 9 files changed, 14 insertions(+), 7 deletions(-)
arch/x86/cpu/baytrail/cpu.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <cpu.h> #include <dm.h> +#include <init.h> #include <pci.h> #include <asm/cpu.h> #include <asm/cpu_x86.h>
arch/x86/cpu/baytrail/valleyview.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <init.h> #include <mmc.h> #include <pci_ids.h> #include <asm/irq.h>
arch/x86/cpu/cpu.c +1 -0
@@ -24,6 +24,7 @@#include <cpu_func.h> #include <dm.h> #include <errno.h> +#include <init.h> #include <malloc.h> #include <syscon.h> #include <asm/acpi.h>
arch/x86/cpu/i386/cpu.c +1 -0
@@ -20,6 +20,7 @@#include <common.h> #include <cpu_func.h> +#include <init.h> #include <malloc.h> #include <spl.h> #include <asm/control_regs.h>
arch/x86/cpu/i386/interrupt.c +1 -0
@@ -13,6 +13,7 @@#include <common.h> #include <dm.h> #include <efi_loader.h> +#include <init.h> #include <irq_func.h> #include <asm/control_regs.h> #include <asm/i8259.h>
drivers/pci/pci_rom.c +1 -0
@@ -26,6 +26,7 @@#include <bios_emul.h> #include <dm.h> #include <errno.h> +#include <init.h> #include <malloc.h> #include <pci.h> #include <pci_rom.h>
drivers/video/broadwell_igd.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <bios_emul.h> #include <dm.h> +#include <init.h> #include <vbe.h> #include <video.h> #include <asm/cpu.h>
include/common.h +0 -7
@@ -114,13 +114,6 @@ int get_serial_clock(void); offsetof(struct structure , member) == offset, \ "`struct " #structure "` offset for `" #member "` is not " #offset) -/* Avoid using CONFIG_EFI_STUB directly as we may boot from other loaders */ -#ifdef CONFIG_EFI_STUB -#define ll_boot_init () false -#else -#define ll_boot_init () true -#endif -/* Pull in stuff for the build system */ #ifdef DO_DEPS_ONLY # include <env_internal.h>
include/init.h +7 -0
@@ -16,6 +16,13 @@ struct global_data;#ifndef __ASSEMBLY__/* put C only stuff in this section */ +/* Avoid using CONFIG_EFI_STUB directly as we may boot from other loaders */ +#ifdef CONFIG_EFI_STUB +#define ll_boot_init () false +#else +#define ll_boot_init () true +#endif +/* * Function Prototypes */
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 19/35 common: Move ll_boot_init() to init.h
Quoted 3 lines · Simon Glass
This is an init-related function so belongs in that file. Move it.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/c1fc3dad/attachment.sig>
PATCH v2 20/35 common: Move upmconfig() to ppc.h
In reply to Simon GlassThis file is only used by PowerPC so move it to an arch-specific header file.
---
Changes in v2: None
arch/powerpc/include/asm/ppc.h | 1 + board/socrates/socrates.c | 4 ++-- include/common.h | 1 - 3 files changed, 3 insertions(+), 3 deletions(-)
arch/powerpc/include/asm/ppc.h +1 -0
@@ -121,6 +121,7 @@ void print_reginfo(void);void interrupt_init_cpu (unsigned *);void timer_interrupt_cpu (struct pt_regs *);unsigned long search_exception_table (unsigned long addr); +void upmconfig (uint upm,uint *table,uint size);#endif /* !__ASSEMBLY__ */
board/socrates/socrates.c +2 -2
@@ -165,11 +165,11 @@ void local_bus_init (void)/* Init UPMA for FPGA access */ out_be32 (&lbc->mamr,0x44440 );/* Use a customer-supplied value */ -upmconfig (UPMA , (uint *)UPMTableA,sizeof (UPMTableA)/sizeof (int )); +upmconfig (UPMA , (uint *)UPMTableA,sizeof (UPMTableA) /sizeof (int ));/* Init UPMB for Lime controller access */ out_be32 (&lbc->mbmr,0x444440 );/* Use a customer-supplied value */ -upmconfig (UPMB , (uint *)UPMTableB,sizeof (UPMTableB)/sizeof (int )); +upmconfig (UPMB , (uint *)UPMTableB,sizeof (UPMTableB) /sizeof (int )); }#ifdef CONFIG_BOARD_EARLY_INIT_R
include/common.h +0 -1
@@ -74,7 +74,6 @@ phys_size_t get_effective_memsize(void);int testdram (void );#endif /* CONFIG_SYS_DRAM_TEST */ -void upmconfig (unsigned int ,unsigned int *,unsigned int );ulong get_tbclk (void );void reset_misc (void );void reset_cpu (ulong addr);
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 20/35 common: Move upmconfig() to ppc.h
Quoted 4 lines · Simon Glass
This file is only used by PowerPC so move it to an arch-specific header file.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/fba30f5d/attachment.sig>
PATCH v2 21/35 common: Move clock functions into a new file
In reply to Simon GlassThese three clock functions don't use driver model and should be migrated. In the meantime, create a new file to hold them.
---
Changes in v2: None
arch/arm/cpu/arm1136/mx35/generic.c | 1 + arch/arm/cpu/arm926ejs/lpc32xx/clk.c | 1 + arch/arm/cpu/arm926ejs/mx25/generic.c | 1 + arch/arm/cpu/armv7/ls102xa/clock.c | 1 + arch/arm/cpu/armv7/ls102xa/fdt.c | 1 + arch/arm/cpu/armv7/vf610/generic.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 1 + .../arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c | 1 + .../arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/soc.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/spl.c | 1 + arch/arm/cpu/armv8/s32v234/generic.c | 1 + arch/arm/mach-imx/mx7/clock.c | 1 + arch/arm/mach-imx/mx7ulp/clock.c | 1 + arch/arm/mach-imx/speed.c | 1 + arch/m68k/cpu/mcf5227x/speed.c | 1 + arch/m68k/cpu/mcf523x/speed.c | 1 + arch/m68k/cpu/mcf52x2/speed.c | 3 ++- arch/m68k/cpu/mcf530x/speed.c | 1 + arch/m68k/cpu/mcf532x/speed.c | 1 + arch/m68k/cpu/mcf5445x/speed.c | 1 + arch/m68k/cpu/mcf547x_8x/speed.c | 1 + arch/mips/mach-ath79/ar933x/clk.c | 1 + arch/mips/mach-ath79/ar934x/clk.c | 1 + arch/mips/mach-ath79/qca953x/clk.c | 1 + arch/mips/mach-ath79/qca956x/clk.c | 1 + arch/powerpc/cpu/mpc83xx/fdt.c | 1 + arch/powerpc/cpu/mpc83xx/speed.c | 1 + arch/powerpc/cpu/mpc83xx/spl_minimal.c | 1 + arch/powerpc/cpu/mpc85xx/fdt.c | 1 + arch/powerpc/cpu/mpc85xx/speed.c | 5 ++--- arch/powerpc/cpu/mpc86xx/speed.c | 1 + arch/powerpc/cpu/mpc8xx/speed.c | 1 + board/Arcturus/ucp1020/spl.c | 1 + board/compulab/cm_fx6/spl.c | 1 + board/freescale/b4860qds/spl.c | 1 + board/freescale/c29xpcie/spl.c | 1 + board/freescale/ls1021aiot/ls1021aiot.c | 1 + board/freescale/ls1021aqds/ls1021aqds.c | 1 + board/freescale/ls1021atsn/ls1021atsn.c | 1 + board/freescale/ls1021atwr/ls1021atwr.c | 1 + board/freescale/lx2160a/lx2160a.c | 1 + board/freescale/mpc8313erdb/mpc8313erdb.c | 1 + board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c | 1 + board/freescale/p1010rdb/spl.c | 1 + board/freescale/p1022ds/diu.c | 1 + board/freescale/p1022ds/spl.c | 1 + board/freescale/p1_p2_rdb_pc/spl.c | 1 + board/freescale/qemu-ppce500/qemu-ppce500.c | 4 ++-- board/freescale/t102xqds/spl.c | 1 + board/freescale/t102xrdb/spl.c | 1 + board/freescale/t1040qds/diu.c | 1 + board/freescale/t104xrdb/diu.c | 1 + board/freescale/t104xrdb/spl.c | 1 + board/freescale/t208xqds/spl.c | 1 + board/freescale/t208xrdb/spl.c | 1 + board/freescale/t4qds/spl.c | 1 + board/freescale/t4rdb/spl.c | 1 + board/gdsys/p1022/diu.c | 1 + board/kosagi/novena/novena_spl.c | 1 + board/socrates/socrates.c | 1 + common/board_f.c | 1 + drivers/clk/mpc83xx_clk.c | 1 + drivers/net/ag7xxx.c | 1 + drivers/serial/lpc32xx_hsuart.c | 1 + drivers/serial/ns16550.c | 1 + drivers/serial/serial_ar933x.c | 1 + drivers/serial/serial_ns16550.c | 1 + drivers/spi/ath79_spi.c | 1 + include/clock_legacy.h | 14 ++++++++++++++ include/common.h | 5 ----- 71 files changed, 86 insertions(+), 11 deletions(-) create mode 100644 include/clock_legacy.h
arch/arm/cpu/arm1136/mx35/generic.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <div64.h> #include <asm/io.h> #include <linux/errno.h>
arch/arm/cpu/arm926ejs/lpc32xx/clk.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <div64.h> #include <asm/arch/cpu.h> #include <asm/arch/clk.h>
arch/arm/cpu/arm926ejs/mx25/generic.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <div64.h> #include <netdev.h> #include <vsprintf.h>
arch/arm/cpu/armv7/ls102xa/clock.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <asm/io.h> #include <asm/arch/immap_ls102xa.h> #include <asm/arch/clock.h>
arch/arm/cpu/armv7/ls102xa/fdt.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <linux/libfdt.h> #include <fdt_support.h> #include <asm/io.h>
arch/arm/cpu/armv7/vf610/generic.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <cpu_func.h> #include <asm/io.h> #include <asm/arch/imx-regs.h>
arch/arm/cpu/armv8/fsl-layerscape/fdt.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <efi_loader.h> #include <linux/libfdt.h> #include <fdt_support.h>
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <cpu_func.h> #include <linux/compiler.h> #include <asm/io.h>
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <cpu_func.h> #include <linux/compiler.h> #include <fsl_ifc.h>
arch/arm/cpu/armv8/fsl-layerscape/soc.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <env.h> #include <fsl_immap.h> #include <fsl_ifc.h>
arch/arm/cpu/armv8/fsl-layerscape/spl.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <cpu_func.h> #include <env.h> #include <spl.h>
arch/arm/cpu/armv8/s32v234/generic.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/clock.h>
arch/arm/mach-imx/mx7/clock.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <div64.h> #include <asm/io.h> #include <linux/errno.h>
arch/arm/mach-imx/mx7ulp/clock.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <div64.h> #include <asm/io.h> #include <errno.h>
arch/arm/mach-imx/speed.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <asm/arch/imx-regs.h> #include <asm/arch/clock.h>
arch/m68k/cpu/mcf5227x/speed.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <asm/processor.h> #include <asm/immap.h>
arch/m68k/cpu/mcf523x/speed.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <asm/processor.h> #include <asm/immap.h>
arch/m68k/cpu/mcf52x2/speed.c +2 -1
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <asm/processor.h> #include <asm/immap.h> #include <asm/io.h>
@@ -15,7 +16,7 @@DECLARE_GLOBAL_DATA_PTR ;/* get_clocks() fills in gd->cpu_clock and gd->bus_clk */ -int get_clocks (void ) +int get_clocks (void ) {#if defined(CONFIG_M5208 )pll_t *pll = (pll_t *)MMAP_PLL ;
arch/m68k/cpu/mcf530x/speed.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <asm/processor.h> #include <asm/immap.h>
arch/m68k/cpu/mcf532x/speed.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <asm/processor.h> #include <asm/immap.h>
arch/m68k/cpu/mcf5445x/speed.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <asm/processor.h> #include <asm/immap.h>
arch/m68k/cpu/mcf547x_8x/speed.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <asm/processor.h> #include <asm/immap.h>
arch/mips/mach-ath79/ar933x/clk.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <asm/io.h> #include <asm/addrspace.h> #include <asm/types.h>
arch/mips/mach-ath79/ar934x/clk.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <asm/io.h> #include <asm/addrspace.h> #include <asm/types.h>
arch/mips/mach-ath79/qca953x/clk.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <asm/io.h> #include <asm/addrspace.h> #include <asm/types.h>
arch/mips/mach-ath79/qca956x/clk.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <asm/io.h> #include <asm/addrspace.h> #include <asm/types.h>
arch/powerpc/cpu/mpc83xx/fdt.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <linux/libfdt.h> #include <fdt_support.h> #include <asm/processor.h>
arch/powerpc/cpu/mpc83xx/speed.c +1 -0
@@ -9,6 +9,7 @@#ifndef CONFIG_CLK_MPC83XX #include <common.h> +#include <clock_legacy.h> #include <mpc83xx.h> #include <command.h> #include <vsprintf.h>
arch/powerpc/cpu/mpc83xx/spl_minimal.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <mpc83xx.h> #include "lblaw/lblaw.h"
arch/powerpc/cpu/mpc85xx/fdt.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <env.h> #include <linux/libfdt.h> #include <fdt_support.h>
arch/powerpc/cpu/mpc85xx/speed.c +2 -3
@@ -617,8 +617,7 @@ void get_sys_info(sys_info_t *sys_info)#endif } - -int get_clocks (void ) +int get_clocks (void ) {sys_info_t sys_info;#ifdef CONFIG_ARCH_MPC8544
@@ -700,7 +699,7 @@ int get_clocks (void)* get_bus_freq * return system bus freq in Hz *********************************************/ -ulong get_bus_freq (ulong dummy) +ulong get_bus_freq (ulong dummy) {return gd->bus_clk; }
arch/powerpc/cpu/mpc86xx/speed.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <mpc86xx.h> #include <asm/processor.h> #include <asm/io.h>
arch/powerpc/cpu/mpc8xx/speed.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <mpc8xx.h> #include <asm/processor.h> #include <asm/io.h>
board/Arcturus/ucp1020/spl.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <console.h> #include <env.h> #include <env_internal.h>
board/compulab/cm_fx6/spl.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <spl.h> #include <asm/io.h> #include <asm/gpio.h>
board/freescale/b4860qds/spl.c +1 -0
@@ -3,6 +3,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <console.h> #include <env.h> #include <env_internal.h>
board/freescale/c29xpcie/spl.c +1 -0
@@ -3,6 +3,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <console.h> #include <env_internal.h> #include <init.h>
board/freescale/ls1021aiot/ls1021aiot.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <fdt_support.h> #include <init.h> #include <asm/arch/immap_ls102xa.h>
board/freescale/ls1021aqds/ls1021aqds.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <fdt_support.h> #include <i2c.h> #include <init.h>
board/freescale/ls1021atsn/ls1021atsn.c +1 -0
@@ -2,6 +2,7 @@/* Copyright 2016-2019 NXP Semiconductors */ #include <common.h> +#include <clock_legacy.h> #include <fdt_support.h> #include <init.h> #include <asm/arch-ls102xa/ls102xa_soc.h>
board/freescale/ls1021atwr/ls1021atwr.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <fdt_support.h> #include <i2c.h> #include <init.h>
board/freescale/lx2160a/lx2160a.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <dm.h> #include <dm/platform_data/serial_pl01x.h> #include <i2c.h>
board/freescale/mpc8313erdb/mpc8313erdb.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <fdt_support.h> #include <init.h> #if defined(CONFIG_OF_LIBFDT )
board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <command.h> #include <asm/io.h> #include <fsl_diu_fb.h>
board/freescale/p1010rdb/spl.c +1 -0
@@ -3,6 +3,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <console.h> #include <env.h> #include <env_internal.h>
board/freescale/p1022ds/diu.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <command.h> #include <linux/ctype.h> #include <asm/io.h>
board/freescale/p1022ds/spl.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <console.h> #include <env.h> #include <env_internal.h>
board/freescale/p1_p2_rdb_pc/spl.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <console.h> #include <env.h> #include <env_internal.h>
board/freescale/qemu-ppce500/qemu-ppce500.c +2 -2
@@ -323,7 +323,7 @@ void get_sys_info(sys_info_t *sys_info) sys_info->freq_processor[0 ] = freq; } -int get_clocks (void ) +int get_clocks (void ) {sys_info_t sys_info;
@@ -350,7 +350,7 @@ unsigned long get_tbclk (void)* get_bus_freq * return system bus freq in Hz *********************************************/ -ulong get_bus_freq (ulong dummy) +ulong get_bus_freq (ulong dummy) {sys_info_t sys_info;get_sys_info (&sys_info);
board/freescale/t102xqds/spl.c +1 -0
@@ -3,6 +3,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <console.h> #include <env_internal.h> #include <init.h>
board/freescale/t102xrdb/spl.c +1 -0
@@ -3,6 +3,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <console.h> #include <env_internal.h> #include <init.h>
board/freescale/t1040qds/diu.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <command.h> #include <linux/ctype.h> #include <asm/io.h>
board/freescale/t104xrdb/diu.c +1 -0
@@ -4,6 +4,7 @@* Author: Priyanka Jain <[email protected]> */ +#include <clock_legacy.h> #include <asm/io.h> #include <common.h> #include <command.h>
board/freescale/t104xrdb/spl.c +1 -0
@@ -3,6 +3,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <console.h> #include <env_internal.h> #include <init.h>
board/freescale/t208xqds/spl.c +1 -0
@@ -3,6 +3,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <console.h> #include <env_internal.h> #include <init.h>
board/freescale/t208xrdb/spl.c +1 -0
@@ -3,6 +3,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <console.h> #include <env_internal.h> #include <init.h>
board/freescale/t4qds/spl.c +1 -0
@@ -3,6 +3,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <console.h> #include <env_internal.h> #include <init.h>
board/freescale/t4rdb/spl.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <console.h> #include <env_internal.h> #include <init.h>
board/gdsys/p1022/diu.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <command.h> #include <linux/ctype.h> #include <asm/io.h>
board/kosagi/novena/novena_spl.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <init.h> #include <asm/io.h> #include <asm/arch/clock.h>
board/socrates/socrates.c +1 -0
@@ -11,6 +11,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <env.h> #include <pci.h> #include <asm/processor.h>
common/board_f.c +1 -0
@@ -11,6 +11,7 @@#include <common.h> #include <bloblist.h> +#include <clock_legacy.h> #include <console.h> #include <cpu.h> #include <cpu_func.h>
drivers/clk/mpc83xx_clk.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <clk-uclass.h> +#include <clock_legacy.h> #include <dm.h> #include <vsprintf.h> #include <dm/lists.h>
drivers/net/ag7xxx.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <cpu_func.h> #include <dm.h> #include <errno.h>
drivers/serial/lpc32xx_hsuart.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <dm.h> #include <serial.h> #include <dm/platform_data/lpc32xx_hsuart.h>
drivers/serial/ns16550.c +1 -0
@@ -4,6 +4,7 @@* modified to use CONFIG_SYS_ISA_MEM and new defines */ +#include <clock_legacy.h> #include <common.h> #include <clk.h> #include <dm.h>
drivers/serial/serial_ar933x.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <dm.h> #include <div64.h> #include <errno.h>
drivers/serial/serial_ns16550.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <ns16550.h> #include <serial.h> #include <linux/compiler.h>
drivers/spi/ath79_spi.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <clock_legacy.h> #include <spi.h> #include <dm.h> #include <div64.h>
include/clock_legacy.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* (C) Copyright 2000-2009 +* Wolfgang Denk, DENX Software Engineering, wd at denx.de. +*/ + +#ifndef __CLOCK_LEGACY_H +#define __CLOCK_LEGACY_H + +int get_clocks (void ); +unsigned long get_bus_freq (unsigned long dummy); +int get_serial_clock (void ); + +#endif
include/common.h +0 -5
@@ -78,11 +78,6 @@ ulong get_tbclk (void);void reset_misc (void );void reset_cpu (ulong addr); -/* $(CPU)/speed.c */ -int get_clocks (void ); -ulong get_bus_freq (ulong ); -int get_serial_clock (void ); -/* lib/uuid.c */ #include <uuid.h>
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 21/35 common: Move clock functions into a new file
Quoted 4 lines · Simon Glass
These three clock functions don't use driver model and should be migrated. In the meantime, create a new file to hold them.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/b0f67bb0/attachment.sig>
PATCH v2 22/35 common: Move get_tbclk() to time.h
In reply to Simon GlassThis function related to timer and most of the timer functions are in time.h, so move this function there.
---
Changes in v2: None
arch/arm/cpu/arm920t/imx/timer.c | 2 +- arch/arm/cpu/arm926ejs/armada100/timer.c | 2 +- arch/arm/cpu/sa1100/timer.c | 2 +- arch/arm/mach-at91/arm926ejs/timer.c | 1 + arch/arm/mach-at91/armv7/timer.c | 1 + arch/arm/mach-orion5x/timer.c | 2 +- arch/arm/mach-versal/clk.c | 1 + arch/arm/mach-zynq/timer.c | 1 + arch/arm/mach-zynqmp/clk.c | 1 + arch/arm/mach-zynqmp/cpu.c | 1 + arch/mips/cpu/time.c | 1 + arch/powerpc/cpu/mpc83xx/cpu.c | 1 + arch/powerpc/cpu/mpc83xx/spd_sdram.c | 1 + arch/powerpc/cpu/mpc83xx/spl_minimal.c | 1 + arch/powerpc/cpu/mpc85xx/cpu.c | 3 ++- arch/powerpc/cpu/mpc85xx/fdt.c | 1 + arch/powerpc/cpu/mpc85xx/interrupts.c | 1 + arch/powerpc/cpu/mpc86xx/cpu.c | 1 + arch/powerpc/cpu/mpc86xx/interrupts.c | 1 + arch/powerpc/cpu/mpc8xx/cpu.c | 1 + arch/powerpc/cpu/mpc8xx/fdt.c | 1 + arch/powerpc/cpu/mpc8xx/interrupts.c | 1 + board/armltd/integrator/timer.c | 2 +- board/freescale/qemu-ppce500/qemu-ppce500.c | 3 ++- drivers/clk/clk_pic32.c | 1 + include/common.h | 1 - include/time.h | 2 ++ 27 files changed, 29 insertions(+), 8 deletions(-)
arch/arm/cpu/arm920t/imx/timer.c +1 -1
@@ -71,7 +71,7 @@ unsigned long long get_ticks(void)* This function is derived from PowerPC code (timebase clock frequency). * On ARM it returns the number of timer ticks per second. */ -ulong get_tbclk (void ) +ulong get_tbclk (void ) {return CONFIG_SYS_HZ ; }
arch/arm/cpu/arm926ejs/armada100/timer.c +1 -1
@@ -188,7 +188,7 @@ unsigned long long get_ticks(void)* This function is derived from PowerPC code (timebase clock frequency). * On ARM it returns the number of timer ticks per second. */ -ulong get_tbclk (void ) +ulong get_tbclk (void ) {return (ulong )CONFIG_SYS_HZ ; }
arch/arm/cpu/sa1100/timer.c +1 -1
@@ -59,7 +59,7 @@ unsigned long long get_ticks(void)* This function is derived from PowerPC code (timebase clock frequency). * On ARM it returns the number of timer ticks per second. */ -ulong get_tbclk (void ) +ulong get_tbclk (void ) {return CONFIG_SYS_HZ ; }
arch/arm/mach-at91/arm926ejs/timer.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/hardware.h> #include <asm/arch/at91_pit.h>
arch/arm/mach-at91/armv7/timer.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/hardware.h> #include <asm/arch/at91_pit.h>
arch/arm/mach-orion5x/timer.c +1 -1
@@ -165,7 +165,7 @@ unsigned long long get_ticks(void)* This function is derived from PowerPC code (timebase clock frequency). * On ARM it returns the number of timer ticks per second. */ -ulong get_tbclk (void ) +ulong get_tbclk (void ) {return (ulong )CONFIG_SYS_HZ ; }
arch/arm/mach-versal/clk.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <time.h> DECLARE_GLOBAL_DATA_PTR ;
arch/arm/mach-zynq/timer.c +1 -0
@@ -31,6 +31,7 @@#include <common.h> #include <div64.h> #include <dm.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/hardware.h> #include <asm/arch/clk.h>
arch/arm/mach-zynqmp/clk.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <time.h> #include <asm/arch/clk.h> #include <asm/arch/hardware.h> #include <asm/arch/sys_proto.h>
arch/arm/mach-zynqmp/cpu.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <time.h> #include <asm/arch/hardware.h> #include <asm/arch/sys_proto.h> #include <asm/armv8/mmu.h>
arch/mips/cpu/time.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <time.h> #include <asm/mipsregs.h> unsigned long notrace timer_read_counter (void )
arch/powerpc/cpu/mpc83xx/cpu.c +1 -0
@@ -12,6 +12,7 @@#include <common.h> #include <cpu_func.h> #include <irq_func.h> +#include <time.h> #include <vsprintf.h> #include <watchdog.h> #include <command.h>
arch/powerpc/cpu/mpc83xx/spd_sdram.c +1 -0
@@ -14,6 +14,7 @@#include <common.h> #include <cpu_func.h> +#include <time.h> #include <vsprintf.h> #include <asm/processor.h> #include <asm/io.h>
arch/powerpc/cpu/mpc83xx/spl_minimal.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <clock_legacy.h> #include <mpc83xx.h> +#include <time.h> #include "lblaw/lblaw.h" #include "elbc/elbc.h"
arch/powerpc/cpu/mpc85xx/cpu.c +2 -1
@@ -12,6 +12,7 @@#include <common.h> #include <cpu_func.h> #include <irq_func.h> +#include <time.h> #include <vsprintf.h> #include <watchdog.h> #include <command.h>
@@ -332,7 +333,7 @@ int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])#ifndef CONFIG_SYS_FSL_TBCLK_DIV #define CONFIG_SYS_FSL_TBCLK_DIV 8#endif -__weak unsigned long get_tbclk (void ) +__weak unsigned long get_tbclk (void ) {unsigned long tbclk_div =CONFIG_SYS_FSL_TBCLK_DIV ;
arch/powerpc/cpu/mpc85xx/fdt.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <clock_legacy.h> #include <env.h> +#include <time.h> #include <linux/libfdt.h> #include <fdt_support.h> #include <asm/processor.h>
arch/powerpc/cpu/mpc85xx/interrupts.c +1 -0
@@ -12,6 +12,7 @@#include <common.h> #include <irq_func.h> +#include <time.h> #include <watchdog.h> #include <command.h> #include <asm/processor.h>
arch/powerpc/cpu/mpc86xx/cpu.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <cpu_func.h> +#include <time.h> #include <vsprintf.h> #include <watchdog.h> #include <command.h>
arch/powerpc/cpu/mpc86xx/interrupts.c +1 -0
@@ -18,6 +18,7 @@#include <irq_func.h> #include <mpc86xx.h> #include <command.h> +#include <time.h> #include <asm/processor.h> #ifdef CONFIG_POST #include <post.h>
arch/powerpc/cpu/mpc8xx/cpu.c +1 -0
@@ -18,6 +18,7 @@#include <common.h> #include <cpu_func.h> +#include <time.h> #include <vsprintf.h> #include <watchdog.h> #include <command.h>
arch/powerpc/cpu/mpc8xx/fdt.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <time.h> #include <linux/libfdt.h> #include <fdt_support.h>
arch/powerpc/cpu/mpc8xx/interrupts.c +1 -0
@@ -8,6 +8,7 @@#include <irq_func.h> #include <mpc8xx.h> #include <mpc8xx_irq.h> +#include <time.h> #include <asm/cpm_8xx.h> #include <asm/processor.h> #include <asm/io.h>
board/armltd/integrator/timer.c +1 -1
@@ -153,7 +153,7 @@ unsigned long long get_ticks(void)* Return the timebase clock frequency * i.e. how often the timer decrements */ -ulong get_tbclk (void ) +ulong get_tbclk (void ) {unsigned long long tmp =CONFIG_SYS_HZ_CLOCK ;
board/freescale/qemu-ppce500/qemu-ppce500.c +2 -1
@@ -9,6 +9,7 @@#include <env.h> #include <init.h> #include <pci.h> +#include <time.h> #include <asm/processor.h> #include <asm/mmu.h> #include <asm/fsl_pci.h>
@@ -337,7 +338,7 @@ int get_clocks(void)return 0 ; } -unsigned long get_tbclk (void ) +unsigned long get_tbclk (void ) {void *fdt =get_fdt_virt ();int cpus_node =fdt_path_offset (fdt,"/cpus" );
drivers/clk/clk_pic32.c +1 -0
@@ -8,6 +8,7 @@#include <clk-uclass.h> #include <dm.h> #include <div64.h> +#include <time.h> #include <wait_bit.h> #include <dm/lists.h> #include <asm/io.h>
include/common.h +0 -1
@@ -74,7 +74,6 @@ phys_size_t get_effective_memsize(void);int testdram (void );#endif /* CONFIG_SYS_DRAM_TEST */ -ulong get_tbclk (void );void reset_misc (void );void reset_cpu (ulong addr);
include/time.h +2 -0
@@ -6,6 +6,8 @@#include <linux/typecheck.h> #include <linux/types.h> +ulong get_tbclk (void ); +unsigned long get_timer (unsigned long base);/*
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 22/35 common: Move get_tbclk() to time.h
Quoted 4 lines · Simon Glass
This function related to timer and most of the timer functions are in
time.h, so move this function there.Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/e7df2ea5/attachment.sig>
PATCH v2 23/35 common: Move reset_misc() function to arch header
In reply to Simon GlassThis function is only used on ARM devices. Move it out of the common file and to a arch-specific header.
---
Changes in v2: None
arch/arm/include/asm/u-boot-arm.h | 2 ++ include/common.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)
arch/arm/include/asm/u-boot-arm.h +2 -0
@@ -54,6 +54,8 @@ void do_fiq(struct pt_regs *pt_regs);void do_irq (struct pt_regs *pt_regswq);#endif +void reset_misc (void ); +#endif /* __ASSEMBLY__ */ #endif /* _U_BOOT_ARM_H_ */
include/common.h +0 -1
@@ -74,7 +74,6 @@ phys_size_t get_effective_memsize(void);int testdram (void );#endif /* CONFIG_SYS_DRAM_TEST */ -void reset_misc (void );void reset_cpu (ulong addr);/* lib/uuid.c */
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 23/35 common: Move reset_misc() function to arch header
Quoted 4 lines · Simon Glass
This function is only used on ARM devices. Move it out of the common file and to a arch-specific header.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/b0c756b4/attachment.sig>
PATCH v2 24/35 common: Move reset_cpu() to the CPU header
In reply to Simon GlassMove this function out of common.h and into a relevant header file.
---
Changes in v2: None
arch/arc/lib/reset.c | 1 + arch/arm/cpu/arm920t/ep93xx/cpu.c | 1 + arch/arm/cpu/arm920t/imx/timer.c | 3 ++- arch/arm/cpu/arm926ejs/armada100/timer.c | 3 ++- arch/arm/cpu/arm926ejs/mx25/reset.c | 1 + arch/arm/cpu/arm926ejs/mx27/reset.c | 1 + arch/arm/cpu/arm926ejs/mxs/mxs.c | 1 + arch/arm/cpu/arm926ejs/spear/reset.c | 1 + arch/arm/cpu/armv7/bcm281xx/reset.c | 1 + arch/arm/cpu/armv7/bcmcygnus/reset.c | 1 + arch/arm/cpu/armv7/bcmnsp/reset.c | 1 + arch/arm/cpu/armv7/stv0991/reset.c | 1 + arch/arm/cpu/armv8/s32v234/generic.c | 1 + arch/arm/lib/interrupts.c | 3 ++- arch/arm/lib/interrupts_m.c | 1 + arch/arm/lib/reset.c | 1 + arch/arm/mach-at91/arm920t/reset.c | 1 + arch/arm/mach-at91/arm926ejs/reset.c | 1 + arch/arm/mach-at91/armv7/reset.c | 1 + arch/arm/mach-bcm283x/reset.c | 1 + arch/arm/mach-davinci/reset.c | 1 + arch/arm/mach-imx/mx7ulp/soc.c | 1 + arch/arm/mach-k3/common.c | 1 + arch/arm/mach-keystone/ddr3.c | 1 + arch/arm/mach-kirkwood/cpu.c | 1 + arch/arm/mach-mediatek/mt8516/init.c | 1 + arch/arm/mach-mediatek/mt8518/init.c | 1 + arch/arm/mach-meson/board-common.c | 1 + arch/arm/mach-mvebu/armada3700/cpu.c | 1 + arch/arm/mach-omap2/omap5/hwinit.c | 1 + arch/arm/mach-omap2/reset.c | 1 + arch/arm/mach-socfpga/misc_gen5.c | 1 + arch/arm/mach-tegra/cmd_enterrcm.c | 1 + arch/arm/mach-tegra/pmc.c | 1 + arch/arm/mach-uniphier/reset.c | 1 + arch/arm/mach-zynqmp-r5/cpu.c | 1 + arch/nds32/lib/interrupts.c | 1 + arch/sh/cpu/sh4/cpu.c | 2 +- arch/sh/cpu/sh4/watchdog.c | 1 + board/BuR/brppt2/board.c | 1 + board/abilis/tb100/tb100.c | 1 + board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c | 1 + board/armltd/vexpress64/vexpress64.c | 1 + board/atmark-techno/armadillo-800eva/armadillo-800eva.c | 1 + board/bosch/shc/board.c | 1 + board/broadcom/bcmns2/northstar2.c | 1 + board/cavium/thunderx/thunderx.c | 1 + board/compulab/cm_t335/spl.c | 1 + board/freescale/imx8mm_evk/spl.c | 1 + board/freescale/imx8mn_evk/spl.c | 1 + board/freescale/imx8qm_mek/imx8qm_mek.c | 1 + board/freescale/imx8qxp_mek/imx8qxp_mek.c | 1 + board/freescale/mx6memcal/spl.c | 1 + board/hisilicon/hikey/hikey.c | 1 + board/hisilicon/hikey960/hikey960.c | 1 + board/hisilicon/poplar/poplar.c | 1 + board/kmc/kzm9g/kzm9g.c | 1 + board/liebherr/display5/spl.c | 1 + board/phytium/durian/durian.c | 1 + board/qualcomm/dragonboard410c/dragonboard410c.c | 1 + board/qualcomm/dragonboard820c/dragonboard820c.c | 1 + board/renesas/alt/alt.c | 1 + board/renesas/alt/alt_spl.c | 1 + board/renesas/blanche/blanche.c | 1 + board/renesas/condor/condor.c | 1 + board/renesas/draak/draak.c | 1 + board/renesas/eagle/eagle.c | 1 + board/renesas/ebisu/ebisu.c | 1 + board/renesas/gose/gose.c | 1 + board/renesas/gose/gose_spl.c | 1 + board/renesas/grpeach/grpeach.c | 1 + board/renesas/koelsch/koelsch.c | 1 + board/renesas/koelsch/koelsch_spl.c | 1 + board/renesas/lager/lager.c | 1 + board/renesas/lager/lager_spl.c | 1 + board/renesas/porter/porter.c | 1 + board/renesas/porter/porter_spl.c | 1 + board/renesas/rcar-common/gen3-spl.c | 1 + board/renesas/salvator-x/salvator-x.c | 1 + board/renesas/silk/silk.c | 1 + board/renesas/silk/silk_spl.c | 1 + board/renesas/stout/cpld.c | 1 + board/renesas/stout/stout_spl.c | 1 + board/synopsys/emsdp/emsdp.c | 1 + board/synopsys/iot_devkit/iot_devkit.c | 1 + board/technexion/pico-imx6ul/spl.c | 1 + board/technexion/pico-imx7d/spl.c | 1 + board/toradex/apalis-imx8/apalis-imx8.c | 1 + board/toradex/apalis_imx6/apalis_imx6.c | 1 + board/toradex/colibri-imx8x/colibri-imx8x.c | 1 + board/toradex/colibri_imx6/colibri_imx6.c | 1 + board/toradex/colibri_imx7/colibri_imx7.c | 1 + board/ucRobotics/bubblegum_96/bubblegum_96.c | 1 + board/xilinx/versal/board.c | 1 + cmd/tpm_test.c | 1 + drivers/sysreset/sysreset-uclass.c | 1 + drivers/watchdog/imx_watchdog.c | 1 + drivers/watchdog/ulp_wdog.c | 1 + include/common.h | 2 -- include/cpu_func.h | 2 ++ lib/efi/efi_app.c | 1 + 101 files changed, 104 insertions(+), 6 deletions(-)
arch/arc/lib/reset.c +1 -0
@@ -5,6 +5,7 @@#include <command.h> #include <common.h> +#include <cpu_func.h> __weak void reset_cpu (ulong addr) {
arch/arm/cpu/arm920t/ep93xx/cpu.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/arch/ep93xx.h> #include <asm/io.h>
arch/arm/cpu/arm920t/imx/timer.c +2 -1
@@ -13,6 +13,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <time.h> #if defined (CONFIG_IMX )
@@ -79,7 +80,7 @@ ulong get_tbclk(void)/* * Reset the cpu by setting up the watchdog timer and let him time out */ -void reset_cpu (ulong ignored) +void reset_cpu (ulong ignored) {/* Disable watchdog and set Time-Out field to 0 */ WCR =0x00000000 ;
arch/arm/cpu/arm926ejs/armada100/timer.c +2 -1
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <time.h> #include <asm/arch/cpu.h> #include <asm/arch/armada100.h>
@@ -138,7 +139,7 @@ int timer_init(void)* 2. Write key value to TMP_WSAR reg. * 3. Perform write operation. */ -void reset_cpu (unsigned long ignored) +void reset_cpu (unsigned long ignored) {struct armd1mpmu_registers *mpmu = (struct armd1mpmu_registers *)ARMD1_MPMU_BASE ;
arch/arm/cpu/arm926ejs/mx25/reset.c +1 -0
@@ -16,6 +16,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #include <asm/arch/imx-regs.h>
arch/arm/cpu/arm926ejs/mx27/reset.c +1 -0
@@ -16,6 +16,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #include <asm/arch/imx-regs.h>
arch/arm/cpu/arm926ejs/mxs/mxs.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <linux/errno.h> #include <asm/io.h> #include <asm/arch/clock.h>
arch/arm/cpu/arm926ejs/spear/reset.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #include <asm/arch/hardware.h> #include <asm/arch/spr_syscntl.h>
arch/arm/cpu/armv7/bcm281xx/reset.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #include <asm/arch/sysmap.h>
arch/arm/cpu/armv7/bcmcygnus/reset.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #define CRMU_MAIL_BOX1 0x03024028
arch/arm/cpu/armv7/bcmnsp/reset.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #define CRU_RESET_OFFSET 0x1803F184
arch/arm/cpu/armv7/stv0991/reset.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #include <asm/arch/stv0991_wdru.h> void reset_cpu (ulong ignored)
arch/arm/cpu/armv8/s32v234/generic.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <clock_legacy.h> +#include <cpu_func.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/clock.h>
arch/arm/lib/interrupts.c +2 -1
@@ -19,6 +19,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <efi_loader.h> #include <irq_func.h> #include <asm/proc-armv/ptrace.h>
@@ -48,7 +49,7 @@ int disable_interrupts(void)void bad_mode (void ) {panic ("Resetting CPU ...\n" ); -reset_cpu (0 ); +reset_cpu (0 ); }static void show_efi_loaded_images (struct pt_regs *regs)
arch/arm/lib/interrupts_m.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <irq_func.h> /*
arch/arm/lib/reset.c +1 -0
@@ -21,6 +21,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <irq_func.h> __weak void reset_misc (void )
arch/arm/mach-at91/arm920t/reset.c +1 -0
@@ -14,6 +14,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #include <asm/arch/hardware.h> #include <asm/arch/at91_st.h>
arch/arm/mach-at91/arm926ejs/reset.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #include <asm/arch/hardware.h> #include <asm/arch/at91_rstc.h>
arch/arm/mach-at91/armv7/reset.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #include <asm/arch/hardware.h> #include <asm/arch/at91_rstc.h>
arch/arm/mach-bcm283x/reset.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #include <asm/arch/base.h> #include <asm/arch/wdog.h>
arch/arm/mach-davinci/reset.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #include <asm/arch/timer_defs.h> #include <asm/arch/hardware.h>
arch/arm/mach-imx/mx7ulp/soc.c +1 -0
@@ -2,6 +2,7 @@/* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ +#include <cpu_func.h> #include <init.h> #include <asm/io.h> #include <asm/arch/clock.h>
arch/arm/mach-k3/common.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <spl.h> #include "common.h" #include <dm.h>
arch/arm/mach-keystone/ddr3.c +1 -0
@@ -6,6 +6,7 @@* Texas Instruments Incorporated, <www.ti.com> */ +#include <cpu_func.h> #include <asm/io.h> #include <common.h> #include <asm/arch/msmc.h>
arch/arm/mach-kirkwood/cpu.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <command.h> +#include <cpu_func.h> #include <env.h> #include <netdev.h> #include <asm/cache.h>
arch/arm/mach-mediatek/mt8516/init.c +1 -0
@@ -7,6 +7,7 @@#include <clk.h> #include <common.h> +#include <cpu_func.h> #include <dm.h> #include <fdtdec.h> #include <ram.h>
arch/arm/mach-mediatek/mt8518/init.c +1 -0
@@ -8,6 +8,7 @@#include <clk.h> #include <common.h> +#include <cpu_func.h> #include <dm.h> #include <fdtdec.h> #include <ram.h>
arch/arm/mach-meson/board-common.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <init.h> #include <asm/arch/boot.h> #include <env.h>
arch/arm/mach-mvebu/armada3700/cpu.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <dm.h> #include <fdtdec.h> #include <linux/libfdt.h>
arch/arm/mach-omap2/omap5/hwinit.c +1 -0
@@ -12,6 +12,7 @@* Sricharan <[email protected]> */ #include <common.h> +#include <cpu_func.h> #include <palmas.h> #include <asm/armv7.h> #include <asm/arch/cpu.h>
arch/arm/mach-omap2/reset.c +1 -0
@@ -9,6 +9,7 @@* Sricharan R <[email protected]> */ #include <config.h> +#include <cpu_func.h> #include <asm/io.h> #include <asm/arch/cpu.h> #include <linux/compiler.h>
arch/arm/mach-socfpga/misc_gen5.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #include <env.h> #include <errno.h>
arch/arm/mach-tegra/cmd_enterrcm.c +1 -0
@@ -25,6 +25,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <irq_func.h> #include <asm/arch/tegra.h> #include <asm/arch-tegra/pmc.h>
arch/arm/mach-tegra/pmc.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <linux/arm-smccc.h>
arch/arm/mach-uniphier/reset.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <linux/io.h> #include <asm/secure.h>
arch/arm/mach-zynqmp-r5/cpu.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/armv7_mpu.h> DECLARE_GLOBAL_DATA_PTR ;
arch/nds32/lib/interrupts.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <irq_func.h> #include <asm/ptrace.h> #include <asm/system.h>
arch/sh/cpu/sh4/cpu.c +1 -1
@@ -31,7 +31,7 @@ int cleanup_before_linux (void)int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {disable_interrupts (); -reset_cpu (0 ); +reset_cpu (0 );return 0 ; }
arch/sh/cpu/sh4/watchdog.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ #include <common.h> +#include <cpu_func.h> #include <asm/processor.h> #include <asm/system.h> #include <asm/io.h>
board/BuR/brppt2/board.c +1 -0
@@ -7,6 +7,7 @@* */ #include <common.h> +#include <cpu_func.h> #include <spl.h> #include <dm.h> #include <miiphy.h>
board/abilis/tb100/tb100.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <netdev.h> #include <asm/io.h>
board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <errno.h> #include <linux/libfdt.h> #include <asm/io.h>
board/armltd/vexpress64/vexpress64.c +1 -0
@@ -5,6 +5,7 @@* Sharma Bhupesh <[email protected]> */ #include <common.h> +#include <cpu_func.h> #include <dm.h> #include <malloc.h> #include <errno.h>
board/atmark-techno/armadillo-800eva/armadillo-800eva.c +1 -0
@@ -21,6 +21,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <init.h> #include <malloc.h> #include <asm/processor.h>
board/bosch/shc/board.c +1 -0
@@ -12,6 +12,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <env.h> #include <errno.h> #include <init.h>
board/broadcom/bcmns2/northstar2.c +1 -0
@@ -3,6 +3,7 @@* (C) Copyright 2016 Broadcom Ltd. */ #include <common.h> +#include <cpu_func.h> #include <asm/system.h> #include <asm/armv8/mmu.h>
board/cavium/thunderx/thunderx.c +1 -0
@@ -4,6 +4,7 @@**/ #include <common.h> +#include <cpu_func.h> #include <dm.h> #include <init.h> #include <malloc.h>
board/compulab/cm_t335/spl.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <errno.h> #include <asm/arch/ddr_defs.h>
board/freescale/imx8mm_evk/spl.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <spl.h> #include <asm/io.h> #include <asm/mach-imx/iomux-v3.h>
board/freescale/imx8mn_evk/spl.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <spl.h> #include <asm/io.h> #include <asm/mach-imx/iomux-v3.h>
board/freescale/imx8qm_mek/imx8qm_mek.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <env.h> #include <errno.h> #include <init.h>
board/freescale/imx8qxp_mek/imx8qxp_mek.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <env.h> #include <errno.h> #include <init.h>
board/freescale/mx6memcal/spl.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #include <asm/arch/iomux.h> #include <asm/arch/clock.h>
board/hisilicon/hikey/hikey.c +1 -0
@@ -4,6 +4,7 @@* Peter Griffin <[email protected]> */ #include <common.h> +#include <cpu_func.h> #include <dm.h> #include <fdt_support.h> #include <dm/platform_data/serial_pl01x.h>
board/hisilicon/hikey960/hikey960.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <dm.h> #include <errno.h> #include <asm/io.h>
board/hisilicon/poplar/poplar.c +1 -0
@@ -4,6 +4,7 @@* Jorge Ramirez-Ortiz <[email protected]> */ +#include <cpu_func.h> #include <dm.h> #include <common.h> #include <asm/io.h>
board/kmc/kzm9g/kzm9g.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #include <asm/arch/sys_proto.h> #include <asm/gpio.h>
board/liebherr/display5/spl.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <env.h> #include <serial.h> #include <spl.h>
board/phytium/durian/durian.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/armv8/mmu.h> #include <asm/system.h> #include <asm/io.h>
board/qualcomm/dragonboard410c/dragonboard410c.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <dm.h> #include <env.h> #include <init.h>
board/qualcomm/dragonboard820c/dragonboard820c.c +1 -0
@@ -5,6 +5,7 @@* (C) Copyright 2017 Jorge Ramirez-Ortiz <[email protected]> */ +#include <cpu_func.h> #include <asm/arch/sysmap-apq8096.h> #include <env.h> #include <linux/arm-smccc.h>
board/renesas/alt/alt.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <env.h> #include <malloc.h> #include <dm.h>
board/renesas/alt/alt_spl.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <malloc.h> #include <dm/platform_data/serial_sh.h> #include <asm/processor.h>
board/renesas/blanche/blanche.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/arch/mmc.h> #include <asm/arch/rcar-mstp.h> #include <asm/arch/rmobile.h>
board/renesas/condor/condor.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/processor.h> #include <asm/mach-types.h> #include <asm/io.h>
board/renesas/draak/draak.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <malloc.h> #include <netdev.h> #include <dm.h>
board/renesas/eagle/eagle.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <malloc.h> #include <netdev.h> #include <dm.h>
board/renesas/ebisu/ebisu.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <malloc.h> #include <netdev.h> #include <dm.h>
board/renesas/gose/gose.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <env.h> #include <malloc.h> #include <dm.h>
board/renesas/gose/gose_spl.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <malloc.h> #include <dm/platform_data/serial_sh.h> #include <asm/processor.h>
board/renesas/grpeach/grpeach.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #include <asm/arch/sys_proto.h>
board/renesas/koelsch/koelsch.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <env.h> #include <malloc.h> #include <dm.h>
board/renesas/koelsch/koelsch_spl.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <malloc.h> #include <dm/platform_data/serial_sh.h> #include <asm/processor.h>
board/renesas/lager/lager.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <env.h> #include <env_internal.h> #include <malloc.h>
board/renesas/lager/lager_spl.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <malloc.h> #include <dm/platform_data/serial_sh.h> #include <asm/processor.h>
board/renesas/porter/porter.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <env.h> #include <malloc.h> #include <dm.h>
board/renesas/porter/porter_spl.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <malloc.h> #include <dm/platform_data/serial_sh.h> #include <asm/processor.h>
board/renesas/rcar-common/gen3-spl.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #include <spl.h>
board/renesas/salvator-x/salvator-x.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <malloc.h> #include <netdev.h> #include <dm.h>
board/renesas/silk/silk.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <env.h> #include <malloc.h> #include <dm.h>
board/renesas/silk/silk_spl.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <malloc.h> #include <dm/platform_data/serial_sh.h> #include <asm/processor.h>
board/renesas/stout/cpld.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #include <asm/gpio.h> #include "cpld.h"
board/renesas/stout/stout_spl.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <malloc.h> #include <dm/platform_data/serial_sh.h> #include <asm/processor.h>
board/synopsys/emsdp/emsdp.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <dwmmc.h> #include <malloc.h>
board/synopsys/iot_devkit/iot_devkit.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <malloc.h> #include <dwmmc.h> #include <linux/libfdt.h>
board/technexion/pico-imx6ul/spl.c +1 -0
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0+ +#include <cpu_func.h> #include <asm/arch/clock.h> #include <asm/arch/iomux.h> #include <asm/arch/imx-regs.h>
board/technexion/pico-imx7d/spl.c +1 -0
@@ -5,6 +5,7 @@* Author: Richard Hu <[email protected]> */ +#include <cpu_func.h> #include <asm/arch/clock.h> #include <asm/arch/imx-regs.h> #include <asm/arch/crm_regs.h>
board/toradex/apalis-imx8/apalis-imx8.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <init.h> #include <asm/arch/clock.h>
board/toradex/apalis_imx6/apalis_imx6.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <dm.h> #include <init.h>
board/toradex/colibri-imx8x/colibri-imx8x.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <init.h> #include <asm/arch/clock.h>
board/toradex/colibri_imx6/colibri_imx6.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <dm.h> #include <env.h> #include <init.h>
board/toradex/colibri_imx7/colibri_imx7.c +1 -0
@@ -3,6 +3,7 @@* Copyright (C) 2016-2018 Toradex AG */ +#include <cpu_func.h> #include <asm/arch/clock.h> #include <asm/arch/crm_regs.h> #include <asm/arch/imx-regs.h>
board/ucRobotics/bubblegum_96/bubblegum_96.c +1 -0
@@ -5,6 +5,7 @@* Copyright (C) 2018 Manivannan Sadhasivam <[email protected]> */ +#include <cpu_func.h> #include <linux/arm-smccc.h> #include <linux/psci.h> #include <common.h>
board/xilinx/versal/board.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <fdtdec.h> #include <init.h> #include <malloc.h>
cmd/tpm_test.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <command.h> +#include <cpu_func.h> #include <tpm-v1.h> #include "tpm-user-utils.h"
drivers/sysreset/sysreset-uclass.c +1 -0
@@ -7,6 +7,7 @@#define LOG_CATEGORY UCLASS_SYSRESET#include <common.h> +#include <cpu_func.h> #include <sysreset.h> #include <dm.h> #include <errno.h>
drivers/watchdog/imx_watchdog.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <dm.h> #include <asm/io.h> #include <wdt.h>
drivers/watchdog/ulp_wdog.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #include <asm/arch/imx-regs.h>
include/common.h +0 -2
@@ -74,8 +74,6 @@ phys_size_t get_effective_memsize(void);int testdram (void );#endif /* CONFIG_SYS_DRAM_TEST */ -void reset_cpu (ulong addr); -/* lib/uuid.c */ #include <uuid.h>
include/cpu_func.h +2 -0
@@ -83,5 +83,7 @@ enum {* @param flags Flags to control what is done */ int cleanup_before_linux_select (int flags); + +void reset_cpu (ulong addr); ;#endif
lib/efi/efi_app.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <cpu_func.h> #include <debug_uart.h> #include <dm.h> #include <errno.h>
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 24/35 common: Move reset_cpu() to the CPU header
Quoted 3 lines · Simon Glass
Move this function out of
common.hand into a relevant header file.Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/470b93d2/attachment.sig>
PATCH v2 25/35 image: Rename load_addr, save_addr, save_size
In reply to Simon GlassThese global variables are quite short and generic. In fact the same name is more often used locally for struct members and function arguments.
Add a image_ prefix to make them easier to distinguish.
---
Changes in v2: None
cmd/bmp.c | 8 ++++---- cmd/booti.c | 4 ++-- cmd/bootm.c | 5 +++-- cmd/bootz.c | 4 ++-- cmd/cramfs.c | 4 ++-- cmd/disk.c | 2 +- cmd/elf.c | 4 ++-- cmd/jffs2.c | 4 ++-- cmd/load.c | 6 +++--- cmd/mvebu/bubt.c | 6 ++++-- cmd/nand.c | 2 +- cmd/net.c | 12 ++++++------ cmd/pxe_utils.c | 4 ++-- cmd/reiser.c | 2 +- cmd/source.c | 3 ++- cmd/ximg.c | 2 +- cmd/zfs.c | 2 +- common/board_r.c | 2 +- common/image-fdt.c | 5 +++-- common/image.c | 18 +++++++++--------- common/spl/spl_net.c | 4 ++-- common/update.c | 3 +-- .../ddr/marvell/a38x/ddr3_training_ip_engine.c | 6 +++--- include/common.h | 6 +++--- net/net.c | 2 +- net/nfs.c | 9 +++++---- net/tftp.c | 14 +++++++------- 27 files changed, 74 insertions(+), 69 deletions(-)
cmd/bmp.c +4 -4
@@ -95,8 +95,8 @@ static int do_bmp_info(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[ulong addr;switch (argc) { -case 1 :/* use load_addr as default address */ - addr = load_addr; +case 1 :/* use image_load_addr as default address */ + addr = image_load_addr;break ;case 2 :/* use argument */ addr =simple_strtoul (argv[1 ],NULL ,16 );
@@ -116,8 +116,8 @@ static int do_bmp_display(cmd_tbl_t * cmdtp, int flag, int argc, char * const arsplash_get_pos (&x, &y);switch (argc) { -case 1 :/* use load_addr as default address */ - addr = load_addr; +case 1 :/* use image_load_addr as default address */ + addr = image_load_addr;break ;case 2 :/* use argument */ addr =simple_strtoul (argv[1 ],NULL ,16 );
cmd/booti.c +2 -2
@@ -30,9 +30,9 @@ static int booti_start(cmd_tbl_t *cmdtp, int flag, int argc,/* Setup Linux kernel Image entry point */ if (!argc) { - ld = load_addr; + ld = image_load_addr;debug ("* kernel: default image load address = 0x%08lx\n" , - load_addr); + image_load_addr); }else { ld =simple_strtoul (argv[0 ],NULL ,16 );debug ("* kernel: cmdline image address = 0x%08lx\n" , ld);
cmd/bootm.c +3 -2
@@ -144,7 +144,8 @@ int bootm_maybe_autostart(cmd_tbl_t *cmdtp, const char *cmd)char *local_args[2 ]; local_args[0 ] = (char *)cmd; local_args[1 ] =NULL ; -printf ("Automatic boot of image at addr 0x%08lX ...\n" , load_addr); +printf ("Automatic boot of image at addr 0x%08lX ...\n" , + image_load_addr);return do_bootm (cmdtp,0 ,1 , local_args); }
@@ -232,7 +233,7 @@ static int do_iminfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])int rcode =0 ;if (argc <2 ) { -return image_info (load_addr); +return image_info (image_load_addr); }for (arg =1 ; arg < argc; ++arg) {
cmd/bootz.c +2 -2
@@ -33,9 +33,9 @@ static int bootz_start(cmd_tbl_t *cmdtp, int flag, int argc,/* Setup Linux kernel zImage entry point */ if (!argc) { - images->ep = load_addr; + images->ep = image_load_addr;debug ("* kernel: default image load address = 0x%08lx\n" , - load_addr); + image_load_addr); }else { images->ep =simple_strtoul (argv[0 ],NULL ,16 ); debug("* kernel: cmdline image address = 0x%08lx\n",
cmd/cramfs.c +2 -2
@@ -97,7 +97,7 @@ int do_cramfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) {char *filename;int size; -ulong offset = load_addr; +ulong offset = image_load_addr;char *offset_virt;struct part_info part;
@@ -127,7 +127,7 @@ int do_cramfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) }if (argc ==3 ) { offset =simple_strtoul (argv[1 ],NULL ,0 ); - load_addr = offset; + image_load_addr = offset; filename = argv[2 ]; }
cmd/disk.c +1 -1
@@ -124,7 +124,7 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,flush_cache (addr, (cnt+1 )*info.blksz);/* Loading ok, update default load address */ - load_addr = addr; + image_load_addr = addr;return bootm_maybe_autostart (cmdtp, argv[0 ]); }
cmd/elf.c +2 -2
@@ -294,7 +294,7 @@ int do_bootelf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])/* Consume address */ argc--; argv++; }else - addr = load_addr; + addr = image_load_addr;if (!valid_elf_image (addr))return 1 ;
@@ -348,7 +348,7 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])* If we don't know where the image is then we're done. */ if (argc <2 ) - addr = load_addr; + addr = image_load_addr;else addr =simple_strtoul (argv[1 ],NULL ,16 );
cmd/jffs2.c +2 -2
@@ -476,7 +476,7 @@ int do_jffs2_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])char *filename;int size;struct part_info *part; -ulong offset = load_addr; +ulong offset = image_load_addr;/* pre-set Boot file name */ filename =env_get ("bootfile" );
@@ -488,7 +488,7 @@ int do_jffs2_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) }if (argc ==3 ) { offset =simple_strtoul (argv[1 ],NULL ,16 ); - load_addr = offset; + image_load_addr = offset; filename = argv[2 ]; }
cmd/load.c +3 -3
@@ -109,7 +109,7 @@ static int do_load_serial(cmd_tbl_t *cmdtp, int flag, int argc, rcode =1 ; }else {printf ("## Start Addr = 0x%08lX\n" , addr); - load_addr = addr; + image_load_addr = addr; }#ifdef CONFIG_SYS_LOADS_BAUD_CHANGE
@@ -485,12 +485,12 @@ static int do_load_serial_bin(cmd_tbl_t *cmdtp, int flag, int argc, addr =load_serial_bin (offset);if (addr == ~0 ) { - load_addr =0 ; + image_load_addr =0 ;printf ("## Binary (kermit) download aborted\n" ); rcode =1 ; }else {printf ("## Start Addr = 0x%08lX\n" , addr); - load_addr = addr; + image_load_addr = addr; } }if (load_baudrate != current_baudrate) {
cmd/mvebu/bubt.c +4 -2
@@ -423,8 +423,10 @@ static int is_usb_active(void)#ifdef CONFIG_CMD_NET static size_t tftp_read_file (const char *file_name) { -/* update global variable load_addr before tftp file from network */ - load_addr =get_load_addr (); +/* +* update global variable image_load_addr before tftp file from network +*/ + image_load_addr =get_load_addr ();return net_loop (TFTPGET ); }
cmd/nand.c +1 -1
@@ -925,7 +925,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, struct mtd_info *mtd,/* Loading ok, update default load address */ - load_addr = addr; + image_load_addr = addr;return bootm_maybe_autostart (cmdtp, cmd); }
cmd/net.c +6 -6
@@ -186,10 +186,10 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc, net_boot_file_name_explicit = false; -/* pre-set load_addr */ +/* pre-set image_load_addr */ s =env_get ("loadaddr" );if (s !=NULL ) - load_addr =simple_strtoul (s,NULL ,16 ); + image_load_addr =simple_strtoul (s,NULL ,16 );switch (argc) {case 1 :
@@ -206,7 +206,7 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,*/ addr =simple_strtoul (argv[1 ], &end,16 );if (end == (argv[1 ] +strlen (argv[1 ]))) { - load_addr = addr; + image_load_addr = addr;/* refresh bootfile name from env */ copy_filename (net_boot_file_name,env_get ("bootfile" ),sizeof (net_boot_file_name));
@@ -218,7 +218,7 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,break ;case 3 : - load_addr =simple_strtoul (argv[1 ],NULL ,16 ); + image_load_addr =simple_strtoul (argv[1 ],NULL ,16 ); net_boot_file_name_explicit = true;copy_filename (net_boot_file_name, argv[2 ],sizeof (net_boot_file_name));
@@ -227,8 +227,8 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,#ifdef CONFIG_CMD_TFTPPUT case 4 : -if (strict_strtoul (argv[1 ],16 , &save_addr) <0 || -strict_strtoul (argv[2 ],16 , &save_size) <0 ) { +if (strict_strtoul (argv[1 ],16 , &image_save_addr) <0 || +strict_strtoul (argv[2 ],16 , &image_save_size) <0 ) {printf ("Invalid address/size\n" );return CMD_RET_USAGE ; }
cmd/pxe_utils.c +2 -2
@@ -1310,9 +1310,9 @@ void handle_pxe_menu(cmd_tbl_t *cmdtp, struct pxe_menu *cfg)#ifdef CONFIG_CMD_BMP /* display BMP if available */ if (cfg->bmp) { -if (get_relfile (cmdtp, cfg->bmp, load_addr)) { +if (get_relfile (cmdtp, cfg->bmp, image_load_addr)) {run_command ("cls" ,0 ); -bmp_display (load_addr, +bmp_display (image_load_addr,BMP_ALIGN_CENTER ,BMP_ALIGN_CENTER ); }else { printf("Skipping background bmp %s for failure\n",
cmd/reiser.c +1 -1
@@ -154,7 +154,7 @@ int do_reiserload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) }/* Loading ok, update default load address */ - load_addr = addr; + image_load_addr = addr;printf ("\n%ld bytes read\n" , filelen);env_set_hex ("filesize" , filelen);
cmd/source.c +2 -1
@@ -172,7 +172,8 @@ static int do_source(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) addr =CONFIG_SYS_LOAD_ADDR ;debug ("* source: default load address = 0x%08lx\n" , addr);#if defined(CONFIG_FIT ) - } else if (fit_parse_subimage (argv[1], load_addr, &addr, &fit_uname)) { + } else if (fit_parse_subimage(argv[1], image_load_addr, &addr, + &fit_uname)) {debug ("* source: subimage '%s' from FIT image at 0x%08lx\n" , fit_uname, addr);#endif
cmd/ximg.c +1 -1
@@ -33,7 +33,7 @@static int do_imgextract (cmd_tbl_t * cmdtp,int flag,int argc,char *const argv[]) { -ulong addr = load_addr; +ulong addr = image_load_addr;ulong dest =0 ;ulong data, len;int verify;
cmd/zfs.c +1 -1
@@ -112,7 +112,7 @@ static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]zfs_close (&zfile);/* Loading ok, update default load address */ - load_addr = addr; + image_load_addr = addr;printf ("%llu bytes read\n" , zfile.size);env_set_hex ("filesize" , zfile.size);
common/board_r.c +1 -1
@@ -484,7 +484,7 @@ static int initr_env(void)#endif /* Initialize from environment */ - load_addr =env_get_ulong ("loadaddr" ,16 , load_addr); + image_load_addr =env_get_ulong ("loadaddr" ,16 , image_load_addr);return 0 ; }
common/image-fdt.c +3 -2
@@ -285,7 +285,8 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch, *of_flat_tree =NULL ; *of_size =0 ; - img_addr = (argc ==0 ) ? load_addr :simple_strtoul (argv[0 ],NULL ,16 ); + img_addr = (argc ==0 ) ? image_load_addr : +simple_strtoul (argv[0 ],NULL ,16 ); buf =map_sysmem (img_addr,0 );if (argc >2 )
@@ -304,7 +305,7 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,else if (images->fit_uname_os) default_addr = (ulong )images->fit_hdr_os;else - default_addr = load_addr; + default_addr = image_load_addr;if (fit_parse_conf (select, default_addr, &fdt_addr, &fit_uname_config)) {
common/image.c +9 -9
@@ -556,9 +556,9 @@ static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch,/* Shared dual-format routines */ /*****************************************************************************/ #ifndef USE_HOSTCC -ulong load_addr =CONFIG_SYS_LOAD_ADDR ;/* Default Load Address */ -ulong save_addr;/* Default Save Address */ -ulong save_size;/* Default Save Size (in bytes) */ +ulong image_load_addr =CONFIG_SYS_LOAD_ADDR ;/* Default Load Address */ +ulong image_save_addr;/* Default Save Address */ +ulong image_save_size;/* Default Save Size (in bytes) */ static int on_loadaddr (const char *name,const char *value,enum env_op op,int flags)
@@ -566,7 +566,7 @@ static int on_loadaddr(const char *name, const char *value, enum env_op op,switch (op) {case env_op_create:case env_op_overwrite: - load_addr =simple_strtoul (value,NULL ,16 ); + image_load_addr =simple_strtoul (value,NULL ,16 );break ;default :break ;
@@ -935,15 +935,15 @@ ulong genimg_get_kernel_addr_fit(char * const img_addr,/* find out kernel image address */ if (!img_addr) { - kernel_addr = load_addr; + kernel_addr = image_load_addr;debug ("* kernel: default image load address = 0x%08lx\n" , - load_addr); + image_load_addr);#if CONFIG_IS_ENABLED (FIT ) - } else if (fit_parse_conf(img_addr, load_addr, &kernel_addr, + } else if (fit_parse_conf(img_addr, image_load_addr, &kernel_addr, fit_uname_config)) {debug ("* kernel: config '%s' from image at 0x%08lx\n" , *fit_uname_config, kernel_addr); - }else if (fit_parse_subimage (img_addr, load_addr, &kernel_addr, + }else if (fit_parse_subimage (img_addr, image_load_addr, &kernel_addr, fit_uname_kernel)) {debug ("* kernel: subimage '%s' from image at 0x%08lx\n" , *fit_uname_kernel, kernel_addr);
@@ -1101,7 +1101,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,if (images->fit_uname_os) default_addr = (ulong )images->fit_hdr_os;else - default_addr = load_addr; + default_addr = image_load_addr;if (fit_parse_conf (select, default_addr, &rd_addr, &fit_uname_config)) {
common/spl/spl_net.c +2 -2
@@ -19,14 +19,14 @@ static ulong spl_net_load_read(struct spl_load_info *load, ulong sector, {debug ("%s: sector %lx, count %lx, buf %lx\n" , __func__, sector, count, (ulong )buf); -memcpy (buf, (void *)(load_addr + sector), count); +memcpy (buf, (void *)(image_load_addr + sector), count);return count; }static int spl_net_load_image (struct spl_image_info *spl_image,struct spl_boot_device *bootdev) { -struct image_header *header = (struct image_header *)load_addr; +struct image_header *header = (struct image_header *)image_load_addr;int rv;env_init ();
common/update.c +1 -2
@@ -45,7 +45,6 @@extern ulong tftp_timeout_ms;extern int tftp_timeout_count_max; -extern ulong load_addr;#ifdef CONFIG_MTD_NOR_FLASH extern flash_info_t flash_info[];static uchar *saved_prot_info;
@@ -72,7 +71,7 @@ static int update_load(char *filename, ulong msec_max, int cnt_max, ulong addr)env_set ("netretry" ,"no" );/* download the update file */ - load_addr = addr; + image_load_addr = addr;copy_filename (net_boot_file_name, filename,sizeof (net_boot_file_name)); size =net_loop (TFTPGET );
drivers/ddr/marvell/a38x/ddr3_training_ip_engine.c +3 -3
@@ -612,9 +612,9 @@ int ddr3_tip_load_pattern_to_odpg(u32 dev_num, enum hws_access_type access_type, MASK_ALL_BITS)); } -CHECK_STATUS (ddr3_tip_if_write - (dev_num, access_type, if_id, -ODPG_DATA_BUFFER_OFFS_REG , load_addr,MASK_ALL_BITS )); +CHECK_STATUS (ddr3_tip_if_write (dev_num, access_type, if_id, +ODPG_DATA_BUFFER_OFFS_REG , + image_load_addr,MASK_ALL_BITS ));return MV_OK ; }
include/common.h +3 -3
@@ -62,9 +62,9 @@ void hang (void) __attribute__ ((noreturn));/* common/cmd_source.c */ int source (ulong addr,const char *fit_uname); -extern ulong load_addr;/* Default Load Address */ -extern ulong save_addr;/* Default Save Address */ -extern ulong save_size;/* Default Save Size */ +extern ulong image_load_addr;/* Default Load Address */ +extern ulong image_save_addr;/* Default Save Address */ +extern ulong image_save_size;/* Default Save Size */ /* common/memsize.c */ long get_ram_size (long *,long );
net/net.c +1 -1
@@ -636,7 +636,7 @@ restart:printf ("Bytes transferred = %d (%x hex)\n" , net_boot_file_size, net_boot_file_size);env_set_hex ("filesize" , net_boot_file_size); -env_set_hex ("fileaddr" , load_addr); +env_set_hex ("fileaddr" , image_load_addr); }if (protocol !=NETCONS )eth_halt ();
net/nfs.c +5 -4
@@ -88,14 +88,15 @@ static inline int store_block(uchar *src, unsigned offset, unsigned len)for (i =0 ; i <CONFIG_SYS_MAX_FLASH_BANKS ; i++) {/* start address in flash? */ -if (load_addr + offset >= flash_info[i].start[0 ]) { +if (image_load_addr + offset >= flash_info[i].start[0 ]) { rc =1 ;break ; } }if (rc) {/* Flash is destination for this packet */ - rc =flash_write ((uchar *)src, (ulong)(load_addr+offset), len); + rc =flash_write ((uchar *)src, (ulong )image_load_addr + offset, + len);if (rc) {flash_perror (rc);return -1 ;
@@ -103,7 +104,7 @@ static inline int store_block(uchar *src, unsigned offset, unsigned len) } else#endif /* CONFIG_SYS_DIRECT_FLASH_NFS */ { -void *ptr =map_sysmem (load_addr + offset, len); +void *ptr =map_sysmem (image_load_addr + offset, len);memcpy (ptr, src, len);unmap_sysmem (ptr);
@@ -912,7 +913,7 @@ void nfs_start(void) net_boot_file_expected_size_in_blocks << 9);print_size (net_boot_file_expected_size_in_blocks <<9 ,"" ); } -printf ("\nLoad address: 0x%lx\nLoading: *\b" , load_addr); +printf ("\nLoad address: 0x%lx\nLoading: *\b" , image_load_addr);net_set_timeout_handler (nfs_timeout, nfs_timeout_handler);net_set_udp_handler (nfs_handler);
net/tftp.c +7 -7
@@ -221,7 +221,7 @@ static int load_block(unsigned block, uchar *dst, unsigned len)ulong tosend = len; tosend =min (net_boot_file_size - offset, tosend); - (void )memcpy (dst, (void *)(save_addr + offset), tosend); + (void )memcpy (dst, (void *)(image_save_addr + offset), tosend);debug ("%s: block=%d, offset=%ld, len=%d, tosend=%ld\n" , __func__, block, offset, len, tosend);return tosend;
@@ -605,7 +605,7 @@ static void tftp_timeout_handler(void) } } -/* Initialize tftp_load_addr and tftp_load_size from load_addr and lmb */ +/* Initialize tftp_load_addr and tftp_load_size from image_load_addr and lmb */ static int tftp_init_load_addr (void ) {#ifdef CONFIG_LMB
@@ -614,13 +614,13 @@ static int tftp_init_load_addr(void)lmb_init_and_reserve (&lmb, gd->bd, (void *)gd->fdt_blob); - max_size =lmb_get_free_size (&lmb, load_addr); + max_size =lmb_get_free_size (&lmb, image_load_addr);if (!max_size)return -1 ; tftp_load_size = max_size;#endif - tftp_load_addr = load_addr; + tftp_load_addr = image_load_addr;return 0 ; }
@@ -710,9 +710,9 @@ void tftp_start(enum proto_t protocol)#ifdef CONFIG_CMD_TFTPPUT tftp_put_active = (protocol ==TFTPPUT );if (tftp_put_active) { -printf ("Save address: 0x%lx\n" , save_addr); -printf ("Save size: 0x%lx\n" , save_size); - net_boot_file_size = save_size; +printf ("Save address: 0x%lx\n" , image_save_addr); +printf ("Save size: 0x%lx\n" , image_save_size); + net_boot_file_size = image_save_size;puts ("Saving: *\b" ); tftp_state =STATE_SEND_WRQ ;new_transfer ();
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 25/35 image: Rename load_addr, save_addr, save_size
Quoted 6 lines · Simon Glass
These global variables are quite short and generic. In fact the same name is more often used locally for struct members and function arguments.
Add a
image_prefix to make them easier to distinguish.Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/f19722c7/attachment.sig>
PATCH v2 26/35 common: Move the image globals into image.h
In reply to Simon GlassThese three globals relate to image handling. Move them to the image header file.
---
Changes in v2: None
cmd/bmp.c | 1 + cmd/bootz.c | 1 + cmd/cramfs.c | 1 + cmd/disk.c | 1 + cmd/elf.c | 1 + cmd/jffs2.c | 1 + cmd/load.c | 1 + cmd/mvebu/bubt.c | 1 + cmd/nand.c | 1 + cmd/net.c | 1 + cmd/pxe_utils.c | 1 + common/board_r.c | 1 + common/update.c | 1 + drivers/ddr/marvell/a38x/ddr3_training_ip_engine.c | 1 + include/common.h | 4 ---- include/image.h | 4 ++++ lib/optee/optee.c | 1 + net/net.c | 1 + net/nfs.c | 1 + net/tftp.c | 1 + 20 files changed, 22 insertions(+), 4 deletions(-)
cmd/bmp.c +1 -0
@@ -13,6 +13,7 @@#include <command.h> #include <dm.h> #include <gzip.h> +#include <image.h> #include <lcd.h> #include <malloc.h> #include <mapmem.h>
cmd/bootz.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <bootm.h> #include <command.h> +#include <image.h> #include <irq_func.h> #include <lmb.h> #include <linux/compiler.h>
cmd/cramfs.c +1 -0
@@ -13,6 +13,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <image.h> #include <malloc.h> #include <mapmem.h> #include <linux/list.h>
cmd/disk.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> #include <cpu_func.h> +#include <image.h> #include <part.h> int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
cmd/elf.c +1 -0
@@ -18,6 +18,7 @@#include <cpu_func.h> #include <elf.h> #include <env.h> +#include <image.h> #include <net.h> #include <vxworks.h> #ifdef CONFIG_X86
cmd/jffs2.c +1 -0
@@ -73,6 +73,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <image.h> #include <malloc.h> #include <jffs2/jffs2.h> #include <linux/list.h>
cmd/load.c +1 -0
@@ -13,6 +13,7 @@#include <cpu_func.h> #include <env.h> #include <flash.h> +#include <image.h> #include <s_record.h> #include <net.h> #include <exports.h>
cmd/mvebu/bubt.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <image.h> #include <vsprintf.h> #include <errno.h> #include <dm.h>
cmd/nand.c +1 -0
@@ -20,6 +20,7 @@*/ #include <common.h> +#include <image.h> #include <linux/mtd/mtd.h> #include <command.h> #include <console.h>
cmd/net.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <image.h> #include <net.h> static int netboot_common (enum proto_t ,cmd_tbl_t *,int ,char *const []);
cmd/pxe_utils.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <env.h> +#include <image.h> #include <malloc.h> #include <mapmem.h> #include <lcd.h>
common/board_r.c +1 -0
@@ -13,6 +13,7 @@#include <api.h> #include <cpu_func.h> #include <exports.h> +#include <image.h> #include <irq_func.h> #include <net.h> #include <u-boot/crc.h>
common/update.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <cpu_func.h> +#include <image.h> #if !(defined(CONFIG_FIT ) && defined(CONFIG_OF_LIBFDT ))#error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature"
drivers/ddr/marvell/a38x/ddr3_training_ip_engine.c +1 -0
@@ -6,6 +6,7 @@#include "ddr3_init.h" #include "mv_ddr_regs.h" #include "ddr_training_ip_db.h" +#include <image.h> #define PATTERN_1 0x55555555#define PATTERN_2 0xaaaaaaaa
include/common.h +0 -4
@@ -62,10 +62,6 @@ void hang (void) __attribute__ ((noreturn));/* common/cmd_source.c */ int source (ulong addr,const char *fit_uname); -extern ulong image_load_addr;/* Default Load Address */ -extern ulong image_save_addr;/* Default Save Address */ -extern ulong image_save_size;/* Default Save Size */ -/* common/memsize.c */ long get_ram_size (long *,long );phys_size_t get_effective_memsize (void );
include/image.h +4 -0
@@ -112,6 +112,10 @@ struct fdt_region;# define IMAGE_OF_SYSTEM_SETUP 0#endif +extern ulong image_load_addr;/* Default Load Address */ +extern ulong image_save_addr;/* Default Save Address */ +extern ulong image_save_size;/* Default Save Size */ +enum ih_category {IH_ARCH ,IH_COMP ,
lib/optee/optee.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <image.h> #include <malloc.h> #include <linux/libfdt.h> #include <tee/optee.h>
net/net.c +1 -0
@@ -93,6 +93,7 @@#include <env.h> #include <env_internal.h> #include <errno.h> +#include <image.h> #include <net.h> #include <net/fastboot.h> #include <net/tftp.h>
net/nfs.c +1 -0
@@ -29,6 +29,7 @@#include <common.h> #include <command.h> #include <flash.h> +#include <image.h> #include <net.h> #include <malloc.h> #include <mapmem.h>
net/tftp.c +1 -0
@@ -10,6 +10,7 @@#include <command.h> #include <efi_loader.h> #include <env.h> +#include <image.h> #include <mapmem.h> #include <net.h> #include <net/tftp.h>
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 26/35 common: Move the image globals into image.h
Quoted 4 lines · Simon Glass
These three globals relate to image handling. Move them to the image header file.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/b1ecc638/attachment.sig>
PATCH v2 27/35 common: Rename and move source()
In reply to Simon GlassThis function has a very generic name which does not adequately describe its purpose. Rename it and move it to image.h, since it relates to reading a script from an image.
---
Changes in v2: None
cmd/source.c | 5 ++--- drivers/usb/gadget/f_sdp.c | 2 +- include/common.h | 3 --- include/image.h | 12 ++++++++++++ 4 files changed, 15 insertions(+), 7 deletions(-)
cmd/source.c +2 -3
@@ -41,8 +41,7 @@ static const char *get_default_image(const void *fit) }#endif -int -source (ulong addr,const char *fit_uname) +int image_source_script (ulong addr,const char *fit_uname) {ulong len;#if defined(CONFIG_LEGACY_IMAGE_FORMAT )
@@ -183,7 +182,7 @@ static int do_source(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) }printf ("## Executing script at %08lx\n" , addr); - rcode =source (addr, fit_uname); + rcode =image_source_script (addr, fit_uname);return rcode; }
drivers/usb/gadget/f_sdp.c +1 -1
@@ -726,7 +726,7 @@ static void sdp_handle_in_ep(struct spl_image_info *spl_image)jump_to_image_no_args (&spl_image);#else /* In U-Boot, allow jumps to scripts */ -source (sdp_func->jmp_address,"script at 1" ); +image_source_script (sdp_func->jmp_address,"script at 1" );#endif }
include/common.h +0 -3
@@ -59,9 +59,6 @@ void hang (void) __attribute__ ((noreturn));#include <display_options.h> -/* common/cmd_source.c */ -int source (ulong addr,const char *fit_uname); -/* common/memsize.c */ long get_ram_size (long *,long );phys_size_t get_effective_memsize (void );
include/image.h +12 -0
@@ -673,6 +673,18 @@ int fit_image_load(bootm_headers_t *images, ulong addr, int arch, int image_type, int bootstage_id, enum fit_load_op load_op, ulong *datap, ulong *lenp); +/** +* image_source_script() - Execute a script +* +* Executes a U-Boot script at a particular address in memory. The script should +* have a header (FIT or legacy) with the script type (IH_TYPE_SCRIPT). +* +* @addr: Address of script +* @fit_uname: FIT subimage name +* @return result code (enum command_ret_t) +*/ +int image_source_script (ulong addr,const char *fit_uname); +#ifndef USE_HOSTCC /** * fit_get_node_from_config() - Look up an image a FIT by type
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 27/35 common: Rename and move source()
Quoted 5 lines · Simon Glass
This function has a very generic name which does not adequately describe its purpose. Rename it and move it to
image.h, since it relates to reading a script from an image.Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/4e0a0529/attachment.sig>
PATCH v2 28/35 common: Move RAM-sizing functions to init.h
In reply to Simon GlassThese functions relate to memory init so move them into the init header.
---
Changes in v2: None
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 1 + arch/arm/cpu/arm926ejs/spear/spr_misc.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 1 + arch/arm/mach-davinci/misc.c | 1 + arch/arm/mach-imx/imx8/cpu.c | 1 + arch/arm/mach-imx/mx5/mx53_dram.c | 1 + arch/arm/mach-imx/mx6/litesom.c | 1 + arch/arm/mach-mediatek/mt7623/init.c | 1 + arch/arm/mach-meson/board-axg.c | 1 + arch/arm/mach-meson/board-g12a.c | 1 + arch/arm/mach-meson/board-gx.c | 1 + arch/arm/mach-mvebu/dram.c | 1 + arch/arm/mach-omap2/am33xx/board.c | 1 + arch/arm/mach-omap2/emif-common.c | 1 + arch/arm/mach-omap2/sec-common.c | 1 + arch/arm/mach-orion5x/dram.c | 1 + arch/arm/mach-sunxi/dram_sun4i.c | 1 + arch/arm/mach-tegra/board.c | 1 + arch/mips/mach-ath79/dram.c | 1 + arch/mips/mach-mtmips/cpu.c | 1 + arch/powerpc/cpu/mpc85xx/traps.c | 1 + arch/powerpc/cpu/mpc86xx/traps.c | 1 + arch/powerpc/lib/bootm.c | 1 + arch/x86/cpu/tangier/sdram.c | 1 + board/AndesTech/adp-ae3xx/adp-ae3xx.c | 1 + board/AndesTech/adp-ag101p/adp-ag101p.c | 1 + board/AndesTech/ax25-ae350/ax25-ae350.c | 1 + board/CarMediaLab/flea3/flea3.c | 1 + board/armltd/integrator/integrator.c | 1 + board/armltd/vexpress/vexpress_common.c | 1 + board/astro/mcf5373l/mcf5373l.c | 1 + board/atmel/at91rm9200ek/at91rm9200ek.c | 1 + board/atmel/at91sam9260ek/at91sam9260ek.c | 1 + board/atmel/at91sam9261ek/at91sam9261ek.c | 1 + board/atmel/at91sam9263ek/at91sam9263ek.c | 1 + board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 1 + board/atmel/at91sam9n12ek/at91sam9n12ek.c | 1 + board/atmel/at91sam9rlek/at91sam9rlek.c | 1 + board/atmel/sam9x60ek/sam9x60ek.c | 1 + board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c | 1 + board/barco/platinum/platinum.c | 1 + board/barco/titanium/titanium.c | 1 + board/bluewater/snapper9260/snapper9260.c | 1 + board/broadcom/bcm23550_w1d/bcm23550_w1d.c | 1 + board/broadcom/bcm28155_ap/bcm28155_ap.c | 1 + board/broadcom/bcm_ep/board.c | 1 + board/broadcom/bcmns2/northstar2.c | 1 + board/calao/usb_a9263/usb_a9263.c | 1 + board/compulab/cl-som-imx7/spl.c | 1 + board/compulab/cm_fx6/spl.c | 1 + board/compulab/cm_t335/spl.c | 1 + board/compulab/cm_t43/spl.c | 1 + board/egnite/ethernut5/ethernut5.c | 1 + board/esd/meesc/meesc.c | 1 + board/esd/vme8349/vme8349.c | 1 + board/freescale/bsc9131rdb/ddr.c | 1 + board/freescale/mpc8308rdb/sdram.c | 1 + board/freescale/mx53ard/mx53ard.c | 1 + board/freescale/mx53smd/mx53smd.c | 1 + board/freescale/s32v234evb/s32v234evb.c | 1 + board/freescale/vf610twr/vf610twr.c | 1 + board/gdsys/mpc8308/sdram.c | 1 + board/hisilicon/poplar/poplar.c | 1 + board/ids/ids8313/ids8313.c | 1 + board/inversepath/usbarmory/usbarmory.c | 1 + board/l+g/vinco/vinco.c | 1 + board/laird/wb45n/wb45n.c | 1 + board/mini-box/picosam9g45/picosam9g45.c | 1 + board/mpc8308_p1m/sdram.c | 1 + board/phytec/pcl063/pcl063.c | 1 + board/phytec/phycore_am335x_r2/board.c | 1 + board/ronetix/pm9261/pm9261.c | 1 + board/ronetix/pm9263/pm9263.c | 1 + board/ronetix/pm9g45/pm9g45.c | 1 + board/samsung/arndale/arndale.c | 1 + board/samsung/smdkc100/smdkc100.c | 1 + board/samsung/smdkv310/smdkv310.c | 1 + board/seco/mx6quq7/mx6quq7.c | 1 + board/siemens/corvus/board.c | 1 + board/siemens/smartweb/smartweb.c | 1 + board/siemens/taurus/taurus.c | 1 + board/socrates/sdram.c | 1 + board/sunxi/board.c | 1 + board/sysam/amcore/amcore.c | 1 + board/technexion/pico-imx6ul/spl.c | 2 ++ board/technologic/ts4800/ts4800.c | 1 + board/ti/ks2_evm/board.c | 1 + board/timll/devkit3250/devkit3250.c | 1 + board/toradex/colibri_imx7/colibri_imx7.c | 2 ++ board/tqc/tqm834x/tqm834x.c | 1 + board/ve8313/ve8313.c | 2 +- board/woodburn/woodburn.c | 1 + cmd/ti/ddr3.c | 1 + common/memsize.c | 1 + drivers/ddr/altera/sdram_gen5.c | 1 + drivers/ddr/altera/sdram_s10.c | 1 + drivers/ram/bmips_ram.c | 1 + drivers/ram/mpc83xx_sdram.c | 1 + drivers/ram/stm32mp1/stm32mp1_ram.c | 1 + drivers/ram/stm32mp1/stm32mp1_tests.c | 1 + include/common.h | 4 ---- include/init.h | 3 +++ lib/fdtdec.c | 1 + 103 files changed, 106 insertions(+), 5 deletions(-)
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <config.h> +#include <init.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/sys_proto.h>
arch/arm/cpu/arm926ejs/spear/spr_misc.c +1 -0
@@ -9,6 +9,7 @@#include <cpu_func.h> #include <env.h> #include <i2c.h> +#include <init.h> #include <net.h> #include <linux/mtd/st_smi.h> #include <asm/io.h>
arch/arm/cpu/armv8/fsl-layerscape/cpu.c +1 -0
@@ -8,6 +8,7 @@#include <cpu_func.h> #include <env.h> #include <fsl_ddr_sdram.h> +#include <init.h> #include <vsprintf.h> #include <asm/io.h> #include <linux/errno.h>
arch/arm/mach-davinci/misc.c +1 -0
@@ -11,6 +11,7 @@#include <common.h> #include <env.h> #include <i2c.h> +#include <init.h> #include <net.h> #include <asm/arch/hardware.h> #include <asm/io.h>
arch/arm/mach-imx/imx8/cpu.c +1 -0
@@ -8,6 +8,7 @@#include <cpu.h> #include <cpu_func.h> #include <dm.h> +#include <init.h> #include <dm/device-internal.h> #include <dm/lists.h> #include <dm/uclass.h>
arch/arm/mach-imx/mx5/mx53_dram.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <init.h> DECLARE_GLOBAL_DATA_PTR ;
arch/arm/mach-imx/mx6/litesom.c +1 -0
@@ -4,6 +4,7 @@* Copyright (C) 2016 Grinn */ +#include <init.h> #include <asm/arch/clock.h> #include <asm/arch/iomux.h> #include <asm/arch/imx-regs.h>
arch/arm/mach-mediatek/mt7623/init.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <init.h> #include <linux/io.h> #include <linux/sizes.h> #include <asm/arch/misc.h>
arch/arm/mach-meson/board-axg.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <init.h> #include <asm/arch/boot.h> #include <asm/arch/eth.h> #include <asm/arch/axg.h>
arch/arm/mach-meson/board-g12a.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <init.h> #include <asm/arch/boot.h> #include <asm/arch/eth.h> #include <asm/arch/g12a.h>
arch/arm/mach-meson/board-gx.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <init.h> #include <asm/arch/boot.h> #include <asm/arch/eth.h> #include <asm/arch/gx.h>
arch/arm/mach-mvebu/dram.c +1 -0
@@ -7,6 +7,7 @@#include <config.h> #include <common.h> +#include <init.h> #include <asm/io.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h>
arch/arm/mach-omap2/am33xx/board.c +1 -0
@@ -11,6 +11,7 @@#include <dm.h> #include <debug_uart.h> #include <errno.h> +#include <init.h> #include <ns16550.h> #include <spl.h> #include <asm/arch/cpu.h>
arch/arm/mach-omap2/emif-common.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <init.h> #include <net.h> #include <asm/emif.h> #include <asm/arch/clock.h>
arch/arm/mach-omap2/sec-common.c +1 -0
@@ -14,6 +14,7 @@#include <common.h> #include <cpu_func.h> +#include <init.h> #include <stdarg.h> #include <asm/arch/sys_proto.h>
arch/arm/mach-orion5x/dram.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <config.h> +#include <init.h> #include <asm/arch/cpu.h> DECLARE_GLOBAL_DATA_PTR ;
arch/arm/mach-sunxi/dram_sun4i.c +1 -0
@@ -21,6 +21,7 @@*/ #include <common.h> +#include <init.h> #include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch/dram.h>
arch/arm/mach-tegra/board.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <cpu_func.h> #include <dm.h> +#include <init.h> #include <ns16550.h> #include <spl.h> #include <asm/io.h>
arch/mips/mach-ath79/dram.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <init.h> #include <linux/sizes.h> #include <asm/addrspace.h> #include <mach/ddr.h>
arch/mips/mach-mtmips/cpu.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <dm.h> +#include <init.h> #include <ram.h> #include <wdt.h> #include <asm/io.h>
arch/powerpc/cpu/mpc85xx/traps.c +1 -0
@@ -21,6 +21,7 @@#include <common.h> #include <command.h> +#include <init.h> #include <irq_func.h> #include <kgdb.h> #include <asm/processor.h>
arch/powerpc/cpu/mpc86xx/traps.c +1 -0
@@ -15,6 +15,7 @@#include <common.h> #include <command.h> +#include <init.h> #include <kgdb.h> #include <asm/processor.h>
arch/powerpc/lib/bootm.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <cpu_func.h> #include <env.h> +#include <init.h> #include <watchdog.h> #include <command.h> #include <image.h>
arch/x86/cpu/tangier/sdram.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <init.h> #include <asm/e820.h> #include <asm/global_data.h> #include <asm/sfi.h>
board/AndesTech/adp-ae3xx/adp-ae3xx.c +1 -0
@@ -5,6 +5,7 @@* Macpaul Lin, Andes Technology Corporation <[email protected]> */ +#include <init.h> #include <asm/mach-types.h> #include <common.h> #if defined(CONFIG_FTMAC100 ) && !defined(CONFIG_DM_ETH )
board/AndesTech/adp-ag101p/adp-ag101p.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <init.h> #if defined(CONFIG_FTMAC100 ) && !defined(CONFIG_DM_ETH )#include <netdev.h> #endif
board/AndesTech/ax25-ae350/ax25-ae350.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <init.h> #if defined(CONFIG_FTMAC100 ) && !defined(CONFIG_DM_ETH )#include <netdev.h> #endif
board/CarMediaLab/flea3/flea3.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <init.h> #include <asm/io.h> #include <env.h> #include <linux/errno.h>
board/armltd/integrator/integrator.c +1 -0
@@ -20,6 +20,7 @@#include <cpu_func.h> #include <dm.h> #include <env.h> +#include <init.h> #include <netdev.h> #include <asm/io.h> #include <dm/platform_data/serial_pl01x.h>
board/armltd/vexpress/vexpress_common.c +1 -0
@@ -17,6 +17,7 @@*/ #include <common.h> #include <cpu_func.h> +#include <init.h> #include <malloc.h> #include <errno.h> #include <netdev.h>
board/astro/mcf5373l/mcf5373l.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <init.h> #include <serial.h> #include <watchdog.h> #include <command.h>
board/atmel/at91rm9200ek/at91rm9200ek.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <init.h> #include <netdev.h> #include <asm/mach-types.h> #include <asm/arch/hardware.h>
board/atmel/at91sam9260ek/at91sam9260ek.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <debug_uart.h> +#include <init.h> #include <net.h> #include <asm/io.h> #include <asm/arch/at91sam9260_matrix.h>
board/atmel/at91sam9261ek/at91sam9261ek.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <debug_uart.h> +#include <init.h> #include <vsprintf.h> #include <asm/io.h> #include <asm/arch/at91sam9261.h>
board/atmel/at91sam9263ek/at91sam9263ek.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <debug_uart.h> +#include <init.h> #include <net.h> #include <vsprintf.h> #include <linux/sizes.h>
board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <debug_uart.h> +#include <init.h> #include <net.h> #include <vsprintf.h> #include <asm/io.h>
board/atmel/at91sam9n12ek/at91sam9n12ek.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <init.h> #include <vsprintf.h> #include <asm/io.h> #include <asm/arch/at91sam9x5_matrix.h>
board/atmel/at91sam9rlek/at91sam9rlek.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <debug_uart.h> +#include <init.h> #include <vsprintf.h> #include <asm/io.h> #include <asm/mach-types.h>
board/atmel/sam9x60ek/sam9x60ek.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <init.h> #include <asm/io.h> #include <asm/arch/at91sam9_smc.h> #include <asm/arch/at91_common.h>
board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <debug_uart.h> +#include <init.h> #include <asm/io.h> #include <asm/arch/at91_common.h> #include <asm/arch/atmel_pio4.h>
board/barco/platinum/platinum.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <init.h> #include <mmc.h> #include <fsl_esdhc_imx.h> #include <miiphy.h>
board/barco/titanium/titanium.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <init.h> #include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch/imx-regs.h>
board/bluewater/snapper9260/snapper9260.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <dm.h> +#include <init.h> #include <asm/io.h> #include <asm/gpio.h> #include <asm/mach-types.h>
board/broadcom/bcm23550_w1d/bcm23550_w1d.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <init.h> #include <asm/io.h> #include <asm/mach-types.h> #include <env.h>
board/broadcom/bcm28155_ap/bcm28155_ap.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <init.h> #include <asm/io.h> #include <asm/mach-types.h> #include <env.h>
board/broadcom/bcm_ep/board.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <cpu_func.h> +#include <init.h> #include <asm/io.h> #include <config.h> #include <netdev.h>
board/broadcom/bcmns2/northstar2.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> #include <cpu_func.h> +#include <init.h> #include <asm/system.h> #include <asm/armv8/mmu.h>
board/calao/usb_a9263/usb_a9263.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <init.h> #include <asm/arch/at91sam9_smc.h> #include <asm/arch/at91_common.h> #include <asm/arch/at91_matrix.h>
board/compulab/cl-som-imx7/spl.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <init.h> #include <spl.h> #include <fsl_esdhc_imx.h> #include <asm/mach-imx/iomux-v3.h>
board/compulab/cm_fx6/spl.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <clock_legacy.h> +#include <init.h> #include <spl.h> #include <asm/io.h> #include <asm/gpio.h>
board/compulab/cm_t335/spl.c +1 -0
@@ -12,6 +12,7 @@#include <common.h> #include <cpu_func.h> #include <errno.h> +#include <init.h> #include <asm/arch/ddr_defs.h> #include <asm/arch/clock.h>
board/compulab/cm_t43/spl.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <init.h> #include <spl.h> #include <i2c.h> #include <asm/arch/clock.h>
board/egnite/ethernut5/ethernut5.c +1 -0
@@ -53,6 +53,7 @@*/ #include <common.h> +#include <init.h> #include <net.h> #include <netdev.h> #include <miiphy.h>
board/esd/meesc/meesc.c +1 -0
@@ -11,6 +11,7 @@#include <common.h> #include <env.h> +#include <init.h> #include <serial.h> #include <vsprintf.h> #include <asm/io.h>
board/esd/vme8349/vme8349.c +1 -0
@@ -13,6 +13,7 @@#include <common.h> #include <fdt_support.h> +#include <init.h> #include <ioports.h> #include <mpc83xx.h> #include <asm/mpc8349_pci.h>
board/freescale/bsc9131rdb/ddr.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <init.h> #include <vsprintf.h> #include <asm/mmu.h> #include <asm/immap_85xx.h>
board/freescale/mpc8308rdb/sdram.c +1 -0
@@ -12,6 +12,7 @@*/ #include <common.h> +#include <init.h> #include <mpc83xx.h> #include <asm/bitops.h>
board/freescale/mx53ard/mx53ard.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <init.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/sys_proto.h>
board/freescale/mx53smd/mx53smd.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <init.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/sys_proto.h>
board/freescale/s32v234evb/s32v234evb.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <init.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/siul.h>
board/freescale/vf610twr/vf610twr.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <init.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/iomux-vf610.h>
board/gdsys/mpc8308/sdram.c +1 -0
@@ -14,6 +14,7 @@#ifndef CONFIG_MPC83XX_SDRAM #include <common.h> +#include <init.h> #include <mpc83xx.h> #include <spd_sdram.h>
board/hisilicon/poplar/poplar.c +1 -0
@@ -7,6 +7,7 @@#include <cpu_func.h> #include <dm.h> #include <common.h> +#include <init.h> #include <asm/io.h> #include <dm/platform_data/serial_pl01x.h> #include <asm/arch/hi3798cv200.h>
board/ids/ids8313/ids8313.c +1 -0
@@ -13,6 +13,7 @@#include <common.h> #include <fdt_support.h> +#include <init.h> #include <mpc83xx.h> #include <spi.h> #include <linux/libfdt.h>
board/inversepath/usbarmory/usbarmory.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <command.h> #include <fs.h> +#include <init.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/sys_proto.h>
board/l+g/vinco/vinco.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <init.h> #include <asm/io.h> #include <asm/arch/at91_common.h> #include <asm/arch/at91_pmc.h>
board/laird/wb45n/wb45n.c +1 -0
@@ -3,6 +3,7 @@*/ #include <common.h> +#include <init.h> #include <asm/io.h> #include <asm/arch/at91sam9x5_matrix.h> #include <asm/arch/at91sam9_smc.h>
board/mini-box/picosam9g45/picosam9g45.c +1 -0
@@ -11,6 +11,7 @@*/ #include <common.h> +#include <init.h> #include <vsprintf.h> #include <asm/io.h> #include <asm/arch/clk.h>
board/mpc8308_p1m/sdram.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <init.h> #include <mpc83xx.h> #include <asm/bitops.h>
board/phytec/pcl063/pcl063.c +1 -0
@@ -6,6 +6,7 @@* Copyright (C) 2015-2016 Stefan Roese <[email protected]> */ +#include <init.h> #include <asm/arch/clock.h> #include <asm/arch/crm_regs.h> #include <asm/arch/mx6-pins.h>
board/phytec/phycore_am335x_r2/board.c +1 -0
@@ -11,6 +11,7 @@*/ #include <common.h> +#include <init.h> #include <spl.h> #include <asm/arch/cpu.h> #include <asm/arch/ddr_defs.h>
board/ronetix/pm9261/pm9261.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <init.h> #include <vsprintf.h> #include <linux/sizes.h> #include <asm/io.h>
board/ronetix/pm9263/pm9263.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <init.h> #include <linux/sizes.h> #include <asm/io.h> #include <asm/gpio.h>
board/ronetix/pm9g45/pm9g45.c +1 -0
@@ -11,6 +11,7 @@*/ #include <common.h> +#include <init.h> #include <linux/sizes.h> #include <asm/io.h> #include <asm/gpio.h>
board/samsung/arndale/arndale.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <cpu_func.h> +#include <init.h> #include <usb.h> #include <asm/gpio.h> #include <asm/arch/pinmux.h>
board/samsung/smdkc100/smdkc100.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <init.h> #include <asm/gpio.h> #include <asm/io.h> #include <asm/arch/sromc.h>
board/samsung/smdkv310/smdkv310.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <init.h> #include <asm/gpio.h> #include <asm/io.h> #include <netdev.h>
board/seco/mx6quq7/mx6quq7.c +1 -0
@@ -7,6 +7,7 @@* Modified by: Boris Brezillon <[email protected]> */ +#include <init.h> #include <asm/arch/clock.h> #include <asm/arch/imx-regs.h> #include <asm/arch/iomux.h>
board/siemens/corvus/board.c +1 -0
@@ -12,6 +12,7 @@#include <common.h> #include <dm.h> +#include <init.h> #include <asm/io.h> #include <asm/arch/at91sam9g45_matrix.h> #include <asm/arch/at91sam9_smc.h>
board/siemens/smartweb/smartweb.c +1 -0
@@ -17,6 +17,7 @@#include <common.h> #include <dm.h> +#include <init.h> #include <asm/io.h> #include <asm/arch/at91sam9_sdramc.h> #include <asm/arch/at91sam9260_matrix.h>
board/siemens/taurus/taurus.c +1 -0
@@ -15,6 +15,7 @@#include <common.h> #include <dm.h> #include <env.h> +#include <init.h> #include <asm/io.h> #include <asm/arch/at91sam9260_matrix.h> #include <asm/arch/at91sam9_smc.h>
board/socrates/sdram.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <init.h> #include <asm/processor.h> #include <asm/immap_85xx.h> #include <fsl_ddr_sdram.h>
board/sunxi/board.c +1 -0
@@ -13,6 +13,7 @@#include <common.h> #include <dm.h> #include <env.h> +#include <init.h> #include <mmc.h> #include <axp_pmic.h> #include <generic-phy.h>
board/sysam/amcore/amcore.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <init.h> #include <asm/immap.h> #include <asm/io.h> #include <dm.h>
board/technexion/pico-imx6ul/spl.c +2 -0
@@ -1,6 +1,8 @@// SPDX-License-Identifier: GPL-2.0+ +#include <common.h> #include <cpu_func.h> +#include <init.h> #include <asm/arch/clock.h> #include <asm/arch/iomux.h> #include <asm/arch/imx-regs.h>
board/technologic/ts4800/ts4800.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <init.h> #include <asm/io.h> #include <asm/gpio.h> #include <asm/arch/imx-regs.h>
board/ti/ks2_evm/board.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include "board.h" #include <env.h> +#include <init.h> #include <spl.h> #include <exports.h> #include <fdt_support.h>
board/timll/devkit3250/devkit3250.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <init.h> #include <asm/arch/sys_proto.h> #include <asm/arch/clk.h> #include <asm/arch/cpu.h>
board/toradex/colibri_imx7/colibri_imx7.c +2 -0
@@ -3,7 +3,9 @@* Copyright (C) 2016-2018 Toradex AG */ +#include <common.h> #include <cpu_func.h> +#include <init.h> #include <asm/arch/clock.h> #include <asm/arch/crm_regs.h> #include <asm/arch/imx-regs.h>
board/tqc/tqm834x/tqm834x.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <fdt_support.h> +#include <init.h> #include <ioports.h> #include <mpc83xx.h> #include <asm/mpc8349_pci.h>
board/ve8313/ve8313.c +1 -1
@@ -82,7 +82,7 @@ static long fixed_sdram(void)/* now check the real size */ disable_addr_trans (); - msize =get_ram_size (CONFIG_SYS_SDRAM_BASE , msize); + msize =get_ram_size (CONFIG_SYS_SDRAM_BASE , msize);enable_addr_trans ();#endif
board/woodburn/woodburn.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <init.h> #include <asm/io.h> #include <linux/errno.h> #include <asm/arch/imx-regs.h>
cmd/ti/ddr3.c +1 -0
@@ -6,6 +6,7 @@*/ #include <cpu_func.h> +#include <init.h> #include <asm/arch/hardware.h> #include <asm/cache.h> #include <asm/emif.h>
common/memsize.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <init.h> DECLARE_GLOBAL_DATA_PTR ;
drivers/ddr/altera/sdram_gen5.c +1 -0
@@ -6,6 +6,7 @@#include <dm.h> #include <errno.h> #include <div64.h> +#include <init.h> #include <ram.h> #include <reset.h> #include <watchdog.h>
drivers/ddr/altera/sdram_s10.c +1 -0
@@ -10,6 +10,7 @@#include <errno.h> #include <div64.h> #include <fdtdec.h> +#include <init.h> #include <ram.h> #include <reset.h> #include "sdram_s10.h"
drivers/ram/bmips_ram.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <dm.h> #include <errno.h> +#include <init.h> #include <ram.h> #include <asm/io.h>
drivers/ram/mpc83xx_sdram.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <dm.h> +#include <init.h> #include <ram.h> #include <dt-bindings/memory/mpc83xx-sdram.h>
drivers/ram/stm32mp1/stm32mp1_ram.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <clk.h> #include <dm.h> +#include <init.h> #include <ram.h> #include <regmap.h> #include <syscon.h>
drivers/ram/stm32mp1/stm32mp1_tests.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> #include <console.h> +#include <init.h> #include <watchdog.h> #include <asm/io.h> #include <linux/log2.h>
include/common.h +0 -4
@@ -59,10 +59,6 @@ void hang (void) __attribute__ ((noreturn));#include <display_options.h> -/* common/memsize.c */ -long get_ram_size (long *,long ); -phys_size_t get_effective_memsize (void ); -#if defined(CONFIG_SYS_DRAM_TEST )int testdram (void );#endif /* CONFIG_SYS_DRAM_TEST */
include/init.h +3 -0
@@ -106,6 +106,9 @@ int dram_init(void);*/ int dram_init_banksize (void ); +long get_ram_size (long *base,long size); +phys_size_t get_effective_memsize (void ); +/** * arch_reserve_stacks() - Reserve all necessary stacks *
lib/fdtdec.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <boot_fit.h> #include <dm.h> +#include <init.h> #include <dm/of_extra.h> #include <env.h> #include <errno.h>
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 28/35 common: Move RAM-sizing functions to init.h
Quoted 4 lines · Simon Glass
These functions relate to memory init so move them into the init header.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/42eacb3b/attachment.sig>
PATCH v2 29/35 common: Move testdram() into init.h
In reply to Simon GlassThis function is called during init so move it to the init header file.
---
Changes in v2: None
board/BuS/eb_cpu5282/eb_cpu5282.c | 3 ++- board/cobra5272/cobra5272.c | 3 ++- board/freescale/m5208evbe/m5208evbe.c | 1 + board/freescale/m52277evb/m52277evb.c | 1 + board/freescale/m5235evb/m5235evb.c | 1 + board/freescale/m5249evb/m5249evb.c | 4 +++- board/freescale/m5253demo/m5253demo.c | 1 + board/freescale/m5272c3/m5272c3.c | 4 +++- board/freescale/m5275evb/m5275evb.c | 1 + board/freescale/m53017evb/m53017evb.c | 1 + board/freescale/m5329evb/m5329evb.c | 1 + board/freescale/m5373evb/m5373evb.c | 1 + board/freescale/m54418twr/m54418twr.c | 1 + board/freescale/m54451evb/m54451evb.c | 1 + board/freescale/mpc837xerdb/mpc837xerdb.c | 1 + board/sbc8641d/sbc8641d.c | 2 +- board/socrates/sdram.c | 2 +- board/sysam/stmark2/stmark2.c | 1 + include/common.h | 4 ---- include/init.h | 2 ++ 20 files changed, 26 insertions(+), 10 deletions(-)
board/BuS/eb_cpu5282/eb_cpu5282.c +2 -1
@@ -12,6 +12,7 @@#include "asm/m5282.h" #include <bmp_layout.h> #include <env.h> +#include <init.h> #include <status_led.h> #include <bus_vcxk.h>
@@ -98,7 +99,7 @@ int dram_init(void) }#if defined(CONFIG_SYS_DRAM_TEST ) -int testdram (void ) +int testdram (void ) {uint *pstart = (uint *)CONFIG_SYS_MEMTEST_START ;uint *pend = (uint *)CONFIG_SYS_MEMTEST_END ;
board/cobra5272/cobra5272.c +2 -1
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <init.h> #include <asm/immap.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -31,7 +32,7 @@ int dram_init(void)return 0 ; }; -int testdram (void ) +int testdram (void ) {/* TODO: XXX XXX XXX */ printf ("DRAM test not implemented!\n" );
board/freescale/m5208evbe/m5208evbe.c +1 -0
@@ -9,6 +9,7 @@#include <config.h> #include <common.h> +#include <init.h> #include <asm/immap.h> #include <asm/io.h>
board/freescale/m52277evb/m52277evb.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <init.h> #include <asm/immap.h> #include <asm/io.h>
board/freescale/m5235evb/m5235evb.c +1 -0
@@ -9,6 +9,7 @@#include <config.h> #include <common.h> +#include <init.h> #include <asm/immap.h> #include <asm/io.h>
board/freescale/m5249evb/m5249evb.c +3 -1
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> +#include <init.h> #include <malloc.h> #include <asm/immap.h>
@@ -89,7 +90,8 @@ int dram_init(void) }; -int testdram (void ) { +int testdram (void ) +{/* TODO: XXX XXX XXX */ printf ("DRAM test not implemented!\n" );
board/freescale/m5253demo/m5253demo.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <init.h> #include <asm/immap.h> #include <netdev.h> #include <asm/io.h>
board/freescale/m5272c3/m5272c3.c +3 -1
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <init.h> #include <asm/immap.h> #include <asm/io.h>
@@ -33,7 +34,8 @@ int dram_init(void)return 0 ; }; -int testdram (void ) { +int testdram (void ) +{/* TODO: XXX XXX XXX */ printf ("DRAM test not implemented!\n" );
board/freescale/m5275evb/m5275evb.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <init.h> #include <asm/immap.h> #include <asm/io.h>
board/freescale/m53017evb/m53017evb.c +1 -0
@@ -9,6 +9,7 @@#include <config.h> #include <common.h> +#include <init.h> #include <asm/immap.h> #include <asm/io.h>
board/freescale/m5329evb/m5329evb.c +1 -0
@@ -9,6 +9,7 @@#include <config.h> #include <common.h> +#include <init.h> #include <asm/immap.h> #include <asm/io.h>
board/freescale/m5373evb/m5373evb.c +1 -0
@@ -9,6 +9,7 @@#include <config.h> #include <common.h> +#include <init.h> #include <asm/immap.h> #include <asm/io.h>
board/freescale/m54418twr/m54418twr.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <init.h> #include <spi.h> #include <asm/io.h> #include <asm/immap.h>
board/freescale/m54451evb/m54451evb.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <init.h> #include <spi.h> #include <asm/immap.h> #include <asm/io.h>
board/freescale/mpc837xerdb/mpc837xerdb.c +1 -0
@@ -9,6 +9,7 @@#include <env.h> #include <hwconfig.h> #include <i2c.h> +#include <init.h> #include <asm/io.h> #include <asm/fsl_mpc83xx_serdes.h> #include <fdt_support.h>
board/sbc8641d/sbc8641d.c +1 -1
@@ -56,7 +56,7 @@ int dram_init(void) }#if defined(CONFIG_SYS_DRAM_TEST ) -int testdram (void ) +int testdram (void ) {uint *pstart = (uint *)CONFIG_SYS_MEMTEST_START ;uint *pend = (uint *)CONFIG_SYS_MEMTEST_END ;
board/socrates/sdram.c +1 -1
@@ -62,7 +62,7 @@ phys_size_t fixed_sdram(void)#endif #if defined(CONFIG_SYS_DRAM_TEST ) -int testdram (void ) +int testdram (void ) {uint *pstart = (uint *)CONFIG_SYS_MEMTEST_START ;uint *pend = (uint *)CONFIG_SYS_MEMTEST_END ;
board/sysam/stmark2/stmark2.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <init.h> #include <spi.h> #include <asm/io.h> #include <asm/immap.h>
include/common.h +0 -4
@@ -59,10 +59,6 @@ void hang (void) __attribute__ ((noreturn));#include <display_options.h> -#if defined(CONFIG_SYS_DRAM_TEST ) -int testdram (void ); -#endif /* CONFIG_SYS_DRAM_TEST */ -/* lib/uuid.c */ #include <uuid.h>
include/init.h +2 -0
@@ -109,6 +109,8 @@ int dram_init_banksize(void);long get_ram_size (long *base,long size);phys_size_t get_effective_memsize (void ); +int testdram (void ); +/** * arch_reserve_stacks() - Reserve all necessary stacks *
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 29/35 common: Move testdram() into init.h
Quoted 3 lines · Simon Glass
This function is called during init so move it to the init header file.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/2ffa524f/attachment.sig>
PATCH v2 30/35 common: Move hang() to the same header as panic()
In reply to Simon GlassAt present panic() is in the vsprintf.h header file. That does not seem like an obvious choice for hang(), even though it relates to panic(). So let's put hang() in its own header.
---
Changes in v2: None
arch/arm/cpu/arm926ejs/mxs/mxs.c | 1 + arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 1 + arch/arm/cpu/armv8/cache_v8.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 1 + arch/arm/include/asm/armv8/mmu.h | 1 + arch/arm/lib/bootm.c | 1 + arch/arm/lib/div0.c | 4 ++-- arch/arm/mach-at91/spl.c | 1 + arch/arm/mach-at91/spl_at91.c | 1 + arch/arm/mach-at91/spl_atmel.c | 1 + arch/arm/mach-davinci/spl.c | 1 + arch/arm/mach-imx/mx6/ddr.c | 1 + arch/arm/mach-imx/spl.c | 1 + arch/arm/mach-k3/security.c | 1 + arch/arm/mach-keystone/mon.c | 1 + arch/arm/mach-mediatek/spl.c | 1 + arch/arm/mach-mvebu/spl.c | 1 + arch/arm/mach-omap2/am33xx/clock.c | 1 + arch/arm/mach-omap2/am33xx/fdt.c | 1 + arch/arm/mach-omap2/clocks-common.c | 1 + arch/arm/mach-omap2/emif-common.c | 1 + arch/arm/mach-omap2/omap5/dra7xx_iodelay.c | 1 + arch/arm/mach-omap2/omap5/fdt.c | 1 + arch/arm/mach-omap2/sec-common.c | 1 + arch/arm/mach-rockchip/bootrom.c | 1 + arch/arm/mach-rockchip/rk3188/rk3188.c | 1 + arch/arm/mach-rockchip/spl.c | 1 + arch/arm/mach-rockchip/tpl.c | 1 + arch/arm/mach-socfpga/mailbox_s10.c | 1 + arch/arm/mach-socfpga/spl_a10.c | 1 + arch/arm/mach-socfpga/spl_gen5.c | 1 + arch/arm/mach-socfpga/spl_s10.c | 1 + arch/arm/mach-stm32mp/spl.c | 1 + arch/arm/mach-tegra/cboot.c | 1 + arch/arm/mach-uniphier/spl_board_init.c | 1 + arch/arm/mach-zynq/spl.c | 1 + arch/microblaze/cpu/exception.c | 1 + arch/microblaze/lib/bootm.c | 1 + arch/mips/lib/traps.c | 1 + arch/mips/mach-ath79/ar934x/clk.c | 1 + arch/mips/mach-jz47xx/jz4780/jz4780.c | 1 + arch/mips/mach-jz47xx/jz4780/sdram.c | 1 + arch/nds32/lib/bootm.c | 1 + arch/nios2/cpu/traps.c | 5 +++-- arch/powerpc/cpu/mpc8xxx/fsl_lbc.c | 1 + arch/riscv/lib/bootm.c | 1 + arch/riscv/lib/interrupts.c | 1 + arch/riscv/lib/reset.c | 1 + arch/riscv/lib/spl.c | 1 + arch/sandbox/cpu/spl.c | 1 + arch/x86/cpu/i386/interrupt.c | 1 + arch/x86/cpu/quark/mrc_util.c | 1 + arch/x86/lib/bootm.c | 1 + arch/x86/lib/spl.c | 1 + arch/x86/lib/tpl.c | 1 + board/BuR/brppt2/board.c | 1 + board/armadeus/apf27/apf27.c | 1 + board/bosch/shc/mux.c | 1 + board/compulab/cl-som-imx7/spl.c | 1 + board/compulab/cm_fx6/spl.c | 1 + board/compulab/cm_t43/spl.c | 1 + board/firefly/firefly-rk3288/firefly-rk3288.c | 1 + board/freescale/imx8mm_evk/spl.c | 1 + board/freescale/imx8mn_evk/spl.c | 1 + board/freescale/imx8mq_evk/spl.c | 1 + board/freescale/ls1012ardb/ls1012ardb.c | 1 + board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 1 + board/gateworks/gw_ventana/gw_ventana_spl.c | 1 + board/gdsys/p1022/controlcenterd-id.c | 1 + board/renesas/alt/alt.c | 1 + board/renesas/condor/condor.c | 1 + board/renesas/draak/draak.c | 1 + board/renesas/eagle/eagle.c | 1 + board/renesas/ebisu/ebisu.c | 1 + board/renesas/gose/gose.c | 1 + board/renesas/koelsch/koelsch.c | 1 + board/renesas/lager/lager.c | 1 + board/renesas/porter/porter.c | 1 + board/renesas/silk/silk.c | 1 + board/samsung/common/board.c | 1 + board/st/stm32mp1/stm32mp1.c | 1 + board/sunxi/board.c | 1 + board/technexion/pico-imx6ul/spl.c | 1 + board/ti/ks2_evm/board.c | 1 + board/ti/ks2_evm/board_k2g.c | 1 + common/board_f.c | 1 + common/board_r.c | 1 + common/bootstage.c | 1 + common/cli.c | 1 + common/spl/spl.c | 1 + common/spl/spl_opensbi.c | 1 + drivers/cache/cache-v5l2.c | 1 + drivers/ddr/altera/sdram_s10.c | 1 + drivers/misc/imx8/scu_api.c | 1 + drivers/mmc/fsl_esdhc_spl.c | 1 + drivers/mtd/nand/raw/mxc_nand_spl.c | 1 + drivers/mtd/spi/fsl_espi_spl.c | 1 + drivers/net/fsl_mcdmafec.c | 1 + drivers/net/mcffec.c | 1 + drivers/net/mpc8xx_fec.c | 1 + drivers/ram/k3-j721e/k3-j721e-ddrss.c | 1 + drivers/ram/rockchip/dmc-rk3368.c | 1 + drivers/ram/rockchip/sdram_rk3188.c | 1 + drivers/ram/rockchip/sdram_rk3288.c | 1 + drivers/serial/serial.c | 1 + drivers/serial/serial_pxa.c | 1 + drivers/sysreset/sysreset-uclass.c | 1 + drivers/usb/musb/musb_udc.c | 1 + drivers/usb/phy/rockchip_usb2_phy.c | 1 + drivers/watchdog/imx_watchdog.c | 1 + drivers/watchdog/mtk_wdt.c | 1 + drivers/watchdog/wdt-uclass.c | 1 + examples/api/libgenwrap.c | 3 ++- include/common.h | 5 ----- include/hang.h | 22 +++++++++++++++++++ lib/fdtdec.c | 1 + lib/hang.c | 1 + lib/libavb/avb_sysdeps_posix.c | 1 + lib/panic.c | 1 + lib/zlib/zutil.c | 3 ++- 120 files changed, 145 insertions(+), 11 deletions(-) create mode 100644 include/hang.h
arch/arm/cpu/arm926ejs/mxs/mxs.c +1 -0
@@ -11,6 +11,7 @@#include <common.h> #include <cpu_func.h> +#include <hang.h> #include <linux/errno.h> #include <asm/io.h> #include <asm/arch/clock.h>
arch/arm/cpu/arm926ejs/mxs/spl_power_init.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <config.h> +#include <hang.h> #include <asm/io.h> #include <asm/arch/imx-regs.h>
arch/arm/cpu/armv8/cache_v8.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <cpu_func.h> +#include <hang.h> #include <asm/system.h> #include <asm/armv8/mmu.h>
arch/arm/cpu/armv8/fsl-layerscape/cpu.c +1 -0
@@ -9,6 +9,7 @@#include <env.h> #include <fsl_ddr_sdram.h> #include <init.h> +#include <hang.h> #include <vsprintf.h> #include <asm/io.h> #include <linux/errno.h>
arch/arm/include/asm/armv8/mmu.h +1 -0
@@ -7,6 +7,7 @@#ifndef _ASM_ARMV8_MMU_H_#define _ASM_ARMV8_MMU_H_ +#include <hang.h> #include <linux/const.h> /*
arch/arm/lib/bootm.c +1 -0
@@ -15,6 +15,7 @@#include <command.h> #include <cpu_func.h> #include <dm.h> +#include <hang.h> #include <dm/root.h> #include <env.h> #include <image.h>
arch/arm/lib/div0.c +2 -2
@@ -4,10 +4,10 @@* Wolfgang Denk, DENX Software Engineering, wd at denx.de. */ +#include <hang.h> +/* Replacement (=dummy) for GNU/Linux division-by zero handler */ void __div0 (void ) { -extern void hang (void ); -hang (); }
arch/arm/mach-at91/spl.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <hang.h> #include <asm/io.h> #include <asm/arch/at91_common.h> #include <asm/arch/at91_wdt.h>
arch/arm/mach-at91/spl_at91.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <hang.h> #include <asm/io.h> #include <asm/arch/at91_common.h> #include <asm/arch/at91sam9_matrix.h>
arch/arm/mach-at91/spl_atmel.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <hang.h> #include <asm/io.h> #include <asm/arch/at91_common.h> #include <asm/arch/at91_pit.h>
arch/arm/mach-davinci/spl.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> #include <config.h> +#include <hang.h> #include <spl.h> #include <asm/u-boot.h> #include <asm/utils.h>
arch/arm/mach-imx/mx6/ddr.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <hang.h> #include <linux/types.h> #include <asm/arch/clock.h> #include <asm/arch/mx6-ddr.h>
arch/arm/mach-imx/spl.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <hang.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/sys_proto.h>
arch/arm/mach-k3/security.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <dm.h> +#include <hang.h> #include <linux/soc/ti/ti_sci_protocol.h> #include <mach/spl.h> #include <spl.h>
arch/arm/mach-keystone/mon.c +1 -0
@@ -5,6 +5,7 @@* Copyright (C) 2012-2019 Texas Instruments Incorporated - http://www.ti.com/ */ +#include <hang.h> #include <asm/unaligned.h> #include <common.h> #include <command.h>
arch/arm/mach-mediatek/spl.c +1 -0
@@ -6,6 +6,7 @@#include <clk.h> #include <common.h> +#include <hang.h> #include <spl.h> #include "init.h"
arch/arm/mach-mvebu/spl.c +1 -0
@@ -7,6 +7,7 @@#include <dm.h> #include <debug_uart.h> #include <fdtdec.h> +#include <hang.h> #include <spl.h> #include <asm/io.h> #include <asm/arch/cpu.h>
arch/arm/mach-omap2/am33xx/clock.c +1 -0
@@ -8,6 +8,7 @@* Copyright (C) 2013, Texas Instruments, Incorporated - http://www.ti.com/ */ #include <common.h> +#include <hang.h> #include <asm/arch/cpu.h> #include <asm/arch/clock.h> #include <asm/arch/hardware.h>
arch/arm/mach-omap2/am33xx/fdt.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <hang.h> #include <linux/libfdt.h> #include <fdt_support.h> #include <malloc.h>
arch/arm/mach-omap2/clocks-common.c +1 -0
@@ -13,6 +13,7 @@* Rajendra Nayak <[email protected]> */ #include <common.h> +#include <hang.h> #include <i2c.h> #include <asm/omap_common.h> #include <asm/gpio.h>
arch/arm/mach-omap2/emif-common.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <hang.h> #include <init.h> #include <net.h> #include <asm/emif.h>
arch/arm/mach-omap2/omap5/dra7xx_iodelay.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <hang.h> #include <asm/utils.h> #include <asm/arch/dra7xx_iodelay.h> #include <asm/arch/omap.h>
arch/arm/mach-omap2/omap5/fdt.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <hang.h> #include <linux/libfdt.h> #include <fdt_support.h> #include <malloc.h>
arch/arm/mach-omap2/sec-common.c +1 -0
@@ -14,6 +14,7 @@#include <common.h> #include <cpu_func.h> +#include <hang.h> #include <init.h> #include <stdarg.h>
arch/arm/mach-rockchip/bootrom.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <hang.h> #include <asm/arch-rockchip/bootrom.h> #include <asm/arch-rockchip/boot_mode.h> #include <asm/io.h>
arch/arm/mach-rockchip/rk3188/rk3188.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> #include <dm.h> +#include <hang.h> #include <syscon.h> #include <asm/io.h> #include <asm/arch-rockchip/bootrom.h>
arch/arm/mach-rockchip/spl.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <debug_uart.h> #include <dm.h> +#include <hang.h> #include <ram.h> #include <spl.h> #include <asm/arch-rockchip/bootrom.h>
arch/arm/mach-rockchip/tpl.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <debug_uart.h> #include <dm.h> +#include <hang.h> #include <ram.h> #include <spl.h> #include <version.h>
arch/arm/mach-socfpga/mailbox_s10.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <hang.h> #include <wait_bit.h> #include <asm/io.h> #include <asm/arch/mailbox_s10.h>
arch/arm/mach-socfpga/spl_a10.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <cpu_func.h> +#include <hang.h> #include <asm/io.h> #include <asm/pl310.h> #include <asm/u-boot.h>
arch/arm/mach-socfpga/spl_gen5.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <hang.h> #include <asm/io.h> #include <asm/u-boot.h> #include <asm/utils.h>
arch/arm/mach-socfpga/spl_s10.c +1 -0
@@ -4,6 +4,7 @@* */ +#include <hang.h> #include <asm/io.h> #include <asm/u-boot.h> #include <asm/utils.h>
arch/arm/mach-stm32mp/spl.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <dm.h> +#include <hang.h> #include <spl.h> #include <asm/io.h> #include <asm/arch/sys_proto.h>
arch/arm/mach-tegra/cboot.c +1 -0
@@ -7,6 +7,7 @@#include <env.h> #include <fdt_support.h> #include <fdtdec.h> +#include <hang.h> #include <stdlib.h> #include <string.h>
arch/arm/mach-uniphier/spl_board_init.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <debug_uart.h> +#include <hang.h> #include <spl.h> #include "init.h"
arch/arm/mach-zynq/spl.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> #include <debug_uart.h> +#include <hang.h> #include <spl.h> #include <asm/io.h>
arch/microblaze/cpu/exception.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <hang.h> #include <asm/asm.h> void _hw_exception_handler (void )
arch/microblaze/lib/bootm.c +1 -0
@@ -12,6 +12,7 @@#include <cpu_func.h> #include <env.h> #include <fdt_support.h> +#include <hang.h> #include <image.h> #include <u-boot/zlib.h> #include <asm/byteorder.h>
arch/mips/lib/traps.c +1 -0
@@ -12,6 +12,7 @@#include <common.h> #include <cpu_func.h> +#include <hang.h> #include <init.h> #include <asm/mipsregs.h> #include <asm/addrspace.h>
arch/mips/mach-ath79/ar934x/clk.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <clock_legacy.h> +#include <hang.h> #include <asm/io.h> #include <asm/addrspace.h> #include <asm/types.h>
arch/mips/mach-jz47xx/jz4780/jz4780.c +1 -0
@@ -9,6 +9,7 @@#include <config.h> #include <common.h> #include <cpu_func.h> +#include <hang.h> #include <init.h> #include <asm/io.h> #include <asm/sections.h>
arch/mips/mach-jz47xx/jz4780/sdram.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <hang.h> #include <asm/io.h> #include <mach/jz4780.h> #include <mach/jz4780_dram.h>
arch/nds32/lib/bootm.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <hang.h> #include <image.h> #include <u-boot/zlib.h> #include <asm/byteorder.h>
arch/nios2/cpu/traps.c +3 -2
@@ -4,8 +4,9 @@* Scott McNutt <[email protected]> */ -#include <asm/ptrace.h> #include <common.h> +#include <hang.h> +#include <asm/ptrace.h> void trap_handler (struct pt_regs *regs) {
@@ -21,5 +22,5 @@ void soft_emulation (struct pt_regs *regs)*/ printf ("\n\n*** ERROR: unimplemented instruction @ %08x\n" , regs->reg[29 ] -4 ); -hang (); +hang (); }
arch/powerpc/cpu/mpc8xxx/fsl_lbc.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <hang.h> #include <asm/fsl_lbc.h> #ifdef CONFIG_MPC83xx
arch/riscv/lib/bootm.c +1 -0
@@ -10,6 +10,7 @@#include <command.h> #include <dm.h> #include <fdt_support.h> +#include <hang.h> #include <dm/root.h> #include <image.h> #include <asm/byteorder.h>
arch/riscv/lib/interrupts.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <hang.h> #include <irq_func.h> #include <asm/ptrace.h> #include <asm/system.h>
arch/riscv/lib/reset.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <command.h> +#include <hang.h> int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {
arch/riscv/lib/spl.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> #include <cpu_func.h> +#include <hang.h> #include <spl.h> #include <asm/smp.h>
arch/sandbox/cpu/spl.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <dm.h> +#include <hang.h> #include <os.h> #include <spl.h> #include <asm/spl.h>
arch/x86/cpu/i386/interrupt.c +1 -0
@@ -13,6 +13,7 @@#include <common.h> #include <dm.h> #include <efi_loader.h> +#include <hang.h> #include <init.h> #include <irq_func.h> #include <asm/control_regs.h>
arch/x86/cpu/quark/mrc_util.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <hang.h> #include <asm/arch/device.h> #include <asm/arch/mrc.h> #include <asm/arch/msg_port.h>
arch/x86/lib/bootm.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <command.h> +#include <hang.h> #include <dm/device.h> #include <dm/root.h> #include <errno.h>
arch/x86/lib/spl.c +1 -0
@@ -7,6 +7,7 @@#include <cpu_func.h> #include <debug_uart.h> #include <dm.h> +#include <hang.h> #include <irq_func.h> #include <malloc.h> #include <spl.h>
arch/x86/lib/tpl.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <debug_uart.h> #include <dm.h> +#include <hang.h> #include <spl.h> #include <asm/cpu.h> #include <asm/mtrr.h>
board/BuR/brppt2/board.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> #include <cpu_func.h> +#include <hang.h> #include <spl.h> #include <dm.h> #include <miiphy.h>
board/armadeus/apf27/apf27.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <hang.h> #include <init.h> #include <jffs2/jffs2.h> #include <nand.h>
board/bosch/shc/mux.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <hang.h> #include <asm/arch/sys_proto.h> #include <asm/arch/hardware.h> #include <asm/arch/mux.h>
board/compulab/cl-som-imx7/spl.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <hang.h> #include <init.h> #include <spl.h> #include <fsl_esdhc_imx.h>
board/compulab/cm_fx6/spl.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <clock_legacy.h> +#include <hang.h> #include <init.h> #include <spl.h> #include <asm/io.h>
board/compulab/cm_t43/spl.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <hang.h> #include <init.h> #include <spl.h> #include <i2c.h>
board/firefly/firefly-rk3288/firefly-rk3288.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <hang.h> #ifdef CONFIG_SPL_BUILD static int setup_led (void )
board/freescale/imx8mm_evk/spl.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <cpu_func.h> +#include <hang.h> #include <spl.h> #include <asm/io.h> #include <asm/mach-imx/iomux-v3.h>
board/freescale/imx8mn_evk/spl.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <cpu_func.h> +#include <hang.h> #include <spl.h> #include <asm/io.h> #include <asm/mach-imx/iomux-v3.h>
board/freescale/imx8mq_evk/spl.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <hang.h> #include <asm/io.h> #include <errno.h> #include <asm/io.h>
board/freescale/ls1012ardb/ls1012ardb.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <fdt_support.h> +#include <hang.h> #include <i2c.h> #include <asm/io.h> #include <asm/arch/clock.h>
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <hang.h> #include <hwconfig.h> #include <init.h> #include <pci.h>
board/gateworks/gw_ventana/gw_ventana_spl.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <env.h> +#include <hang.h> #include <asm/io.h> #include <asm/arch/crm_regs.h> #include <asm/arch/mx6-ddr.h>
board/gdsys/p1022/controlcenterd-id.c +1 -0
@@ -14,6 +14,7 @@#include <command.h> #include <dm.h> #include <env.h> +#include <hang.h> #include <malloc.h> #include <fs.h> #include <i2c.h>
board/renesas/alt/alt.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <cpu_func.h> #include <env.h> +#include <hang.h> #include <malloc.h> #include <dm.h> #include <dm/platform_data/serial_sh.h>
board/renesas/condor/condor.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <cpu_func.h> +#include <hang.h> #include <asm/processor.h> #include <asm/mach-types.h> #include <asm/io.h>
board/renesas/draak/draak.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <cpu_func.h> +#include <hang.h> #include <malloc.h> #include <netdev.h> #include <dm.h>
board/renesas/eagle/eagle.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <cpu_func.h> +#include <hang.h> #include <malloc.h> #include <netdev.h> #include <dm.h>
board/renesas/ebisu/ebisu.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <cpu_func.h> +#include <hang.h> #include <malloc.h> #include <netdev.h> #include <dm.h>
board/renesas/gose/gose.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <cpu_func.h> #include <env.h> +#include <hang.h> #include <malloc.h> #include <dm.h> #include <dm/platform_data/serial_sh.h>
board/renesas/koelsch/koelsch.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <cpu_func.h> #include <env.h> +#include <hang.h> #include <malloc.h> #include <dm.h> #include <dm/platform_data/serial_sh.h>
board/renesas/lager/lager.c +1 -0
@@ -11,6 +11,7 @@#include <cpu_func.h> #include <env.h> #include <env_internal.h> +#include <hang.h> #include <malloc.h> #include <netdev.h> #include <dm.h>
board/renesas/porter/porter.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <cpu_func.h> #include <env.h> +#include <hang.h> #include <malloc.h> #include <dm.h> #include <dm/platform_data/serial_sh.h>
board/renesas/silk/silk.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <cpu_func.h> #include <env.h> +#include <hang.h> #include <malloc.h> #include <dm.h> #include <dm/platform_data/serial_sh.h>
board/samsung/common/board.c +1 -0
@@ -8,6 +8,7 @@#include <cros_ec.h> #include <errno.h> #include <fdtdec.h> +#include <hang.h> #include <init.h> #include <spi.h> #include <tmu.h>
board/st/stm32mp1/stm32mp1.c +1 -0
@@ -12,6 +12,7 @@#include <env_internal.h> #include <g_dnl.h> #include <generic-phy.h> +#include <hang.h> #include <i2c.h> #include <init.h> #include <led.h>
board/sunxi/board.c +1 -0
@@ -13,6 +13,7 @@#include <common.h> #include <dm.h> #include <env.h> +#include <hang.h> #include <init.h> #include <mmc.h> #include <axp_pmic.h>
board/technexion/pico-imx6ul/spl.c +1 -0
@@ -2,6 +2,7 @@#include <common.h> #include <cpu_func.h> +#include <hang.h> #include <init.h> #include <asm/arch/clock.h> #include <asm/arch/iomux.h>
board/ti/ks2_evm/board.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include "board.h" #include <env.h> +#include <hang.h> #include <init.h> #include <spl.h> #include <exports.h>
board/ti/ks2_evm/board_k2g.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <eeprom.h> #include <env.h> +#include <hang.h> #include <init.h> #include <asm/arch/clock.h> #include <asm/ti-common/keystone_net.h>
common/board_f.c +1 -0
@@ -20,6 +20,7 @@#include <env_internal.h> #include <fdtdec.h> #include <fs.h> +#include <hang.h> #include <i2c.h> #include <init.h> #include <initcall.h>
common/board_r.c +1 -0
@@ -13,6 +13,7 @@#include <api.h> #include <cpu_func.h> #include <exports.h> +#include <hang.h> #include <image.h> #include <irq_func.h> #include <net.h>
common/bootstage.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <hang.h> #include <malloc.h> #include <sort.h> #include <spl.h>
common/cli.c +1 -0
@@ -15,6 +15,7 @@#include <console.h> #include <env.h> #include <fdtdec.h> +#include <hang.h> #include <malloc.h> DECLARE_GLOBAL_DATA_PTR ;
common/spl/spl.c +1 -0
@@ -11,6 +11,7 @@#include <binman_sym.h> #include <dm.h> #include <handoff.h> +#include <hang.h> #include <irq_func.h> #include <serial.h> #include <spl.h>
common/spl/spl_opensbi.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <cpu_func.h> #include <errno.h> +#include <hang.h> #include <spl.h> #include <asm/smp.h> #include <opensbi.h>
drivers/cache/cache-v5l2.c +1 -0
@@ -8,6 +8,7 @@#include <command.h> #include <cache.h> #include <dm.h> +#include <hang.h> #include <asm/io.h> #include <dm/ofnode.h>
drivers/ddr/altera/sdram_s10.c +1 -0
@@ -10,6 +10,7 @@#include <errno.h> #include <div64.h> #include <fdtdec.h> +#include <hang.h> #include <init.h> #include <ram.h> #include <reset.h>
drivers/misc/imx8/scu_api.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <hang.h> #include <asm/io.h> #include <dm.h> #include <asm/arch/sci/sci.h>
drivers/mmc/fsl_esdhc_spl.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <cpu_func.h> +#include <hang.h> #include <mmc.h> #include <malloc.h>
drivers/mtd/nand/raw/mxc_nand_spl.c +1 -0
@@ -11,6 +11,7 @@*/ #include <common.h> +#include <hang.h> #include <nand.h> #include <asm/arch/imx-regs.h> #include <asm/io.h>
drivers/mtd/spi/fsl_espi_spl.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <cpu_func.h> +#include <hang.h> #include <spi_flash.h> #include <malloc.h>
drivers/net/fsl_mcdmafec.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <env.h> +#include <hang.h> #include <malloc.h> #include <command.h> #include <config.h>
drivers/net/mcffec.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <env.h> +#include <hang.h> #include <malloc.h> #include <command.h>
drivers/net/mpc8xx_fec.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> +#include <hang.h> #include <malloc.h> #include <net.h> #include <netdev.h>
drivers/ram/k3-j721e/k3-j721e-ddrss.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <clk.h> #include <dm.h> +#include <hang.h> #include <ram.h> #include <asm/io.h> #include <power-domain.h>
drivers/ram/rockchip/dmc-rk3368.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <clk.h> #include <dm.h> +#include <hang.h> #include <dt-bindings/memory/rk3368-dmc.h> #include <dt-structs.h> #include <ram.h>
drivers/ram/rockchip/sdram_rk3188.c +1 -0
@@ -11,6 +11,7 @@#include <dm.h> #include <dt-structs.h> #include <errno.h> +#include <hang.h> #include <ram.h> #include <regmap.h> #include <syscon.h>
drivers/ram/rockchip/sdram_rk3288.c +1 -0
@@ -11,6 +11,7 @@#include <dm.h> #include <dt-structs.h> #include <errno.h> +#include <hang.h> #include <ram.h> #include <regmap.h> #include <syscon.h>
drivers/serial/serial.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <env_internal.h> +#include <hang.h> #include <serial.h> #include <stdio_dev.h> #include <post.h>
drivers/serial/serial_pxa.c +1 -0
@@ -20,6 +20,7 @@*/ #include <common.h> +#include <hang.h> #include <asm/arch/pxa-regs.h> #include <asm/arch/regs-uart.h> #include <asm/io.h>
drivers/sysreset/sysreset-uclass.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <cpu_func.h> +#include <hang.h> #include <sysreset.h> #include <dm.h> #include <errno.h>
drivers/usb/musb/musb_udc.c +1 -0
@@ -38,6 +38,7 @@*/ #include <common.h> +#include <hang.h> #include <serial.h> #include <usbdevice.h> #include <usb/udc.h>
drivers/usb/phy/rockchip_usb2_phy.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <hang.h> #include <asm/io.h> #include "../gadget/dwc2_udc_otg_priv.h"
drivers/watchdog/imx_watchdog.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <cpu_func.h> #include <dm.h> +#include <hang.h> #include <asm/io.h> #include <wdt.h> #include <watchdog.h>
drivers/watchdog/mtk_wdt.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <dm.h> +#include <hang.h> #include <wdt.h> #include <asm/io.h>
drivers/watchdog/wdt-uclass.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <dm.h> #include <errno.h> +#include <hang.h> #include <wdt.h> #include <dm/device-internal.h> #include <dm/lists.h>
examples/api/libgenwrap.c +2 -1
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <hang.h> #include <linux/types.h> #include <api_public.h>
@@ -41,7 +42,7 @@ void *malloc (size_t len)return NULL ; } -void hang (void ) +void hang (void ) {while (1 ) ; }
include/common.h +0 -5
@@ -52,11 +52,6 @@*/ #include <init.h> -/* -* Function Prototypes -*/ -void hang (void ) __attribute__ ((noreturn)); -#include <display_options.h> /* lib/uuid.c */
include/hang.h new file +22 -0
@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* (C) Copyright 2000-2009 +* Wolfgang Denk, DENX Software Engineering, wd at denx.de. +*/ + +#ifndef __HANG_H +#define __HANG_H + +#ifndef __ASSEMBLY__ +/** +* hang() - Print a message and stop execution +* +* This shows a 'hang' message where possible and then goes into an infinite +* loop. This is called by panic() if CONFIG_PANIC_HANG is enabled. +* +* This function does not return. +*/ +void hang (void ) __attribute__ ((noreturn)); +#endif + +#endif
lib/fdtdec.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <boot_fit.h> #include <dm.h> +#include <hang.h> #include <init.h> #include <dm/of_extra.h> #include <env.h>
lib/hang.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <bootstage.h> +#include <hang.h> #include <os.h> /**
lib/libavb/avb_sysdeps_posix.c +1 -0
@@ -3,6 +3,7 @@* Copyright (C) 2016 The Android Open Source Project */ +#include <hang.h> #include <stdarg.h> #include <stdlib.h>
lib/panic.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <hang.h> #if !defined(CONFIG_PANIC_HANG )#include <command.h> #endif
lib/zlib/zutil.c +2 -1
@@ -6,6 +6,7 @@/* @(#) $Id$ */ #include "zutil.h" +#include <hang.h> #ifndef NO_DUMMY_DECL struct internal_state {int dummy;};/* for buggy compilers */
@@ -34,7 +35,7 @@ void z_error (m)char *m; {fprintf (stderr,"%s\n" , m); -hang (); +hang (); }#endif
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 30/35 common: Move hang() to the same header as panic()
Quoted 5 lines · Simon Glass
At present
panic()is in thevsprintf.hheader file. That does not seem like an obvious choice forhang(), even though it relates topanic(). So let's puthang()in its own header.Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/177bcf5b/attachment.sig>
PATCH v2 31/35 common: Move check_member() to kernel.h
In reply to Simon GlassThe kernel.h file has a number of useful macros including a few related to structures. Move check_member() there too.
---
Changes in v2: None
include/common.h | 11 ----------- include/linux/kernel.h | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-)
include/common.h +0 -11
@@ -73,17 +73,6 @@#define ROUND (a,b) (((a) + (b) - 1) & ~((b) - 1)) -/* -* check_member() - Check the offset of a structure member -* -* @structure: Name of structure (e.g. global_data) -* @member: Name of member (e.g. baudrate) -* @offset: Expected offset in bytes -*/ -#define check_member (structure, member, offset) _Static_assert( \ - offsetof(struct structure, member) == offset, \ - "`struct " #structure "` offset for `" #member "` is not " #offset) -/* Pull in stuff for the build system */ #ifdef DO_DEPS_ONLY # include <env_internal.h>
include/linux/kernel.h +11 -0
@@ -268,4 +268,15 @@ const typeof( ((type *)0)->member ) *__mptr = (ptr); \ (type *)( (char *)__mptr - offsetof(type,member) );}) +/* +* check_member() - Check the offset of a structure member +* +* @structure: Name of structure (e.g. global_data) +* @member: Name of member (e.g. baudrate) +* @offset: Expected offset in bytes +*/ +#define check_member (structure, member, offset) _Static_assert( \ + offsetof(struct structure, member) == (offset), \ + "`struct " #structure "` offset for `" #member "` is not " #offset) +#endif
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 31/35 common: Move check_member() to kernel.h
Quoted 4 lines · Simon Glass
The
kernel.hfile has a number of useful macros including a few related to structures. Movecheck_member()there too.Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/54f2d732/attachment.sig>
PATCH v2 32/35 common: Move ROUND() into kernel.h
In reply to Simon GlassMove this macro in with all the other rounding macros.
---
Changes in v2: None
include/common.h | 2 -- include/linux/kernel.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)
include/common.h +0 -2
@@ -71,8 +71,6 @@/* Put only stuff here that the assembler can digest */ -#define ROUND (a,b) (((a) + (b) - 1) & ~((b) - 1)) -/* Pull in stuff for the build system */ #ifdef DO_DEPS_ONLY # include <env_internal.h>
include/linux/kernel.h +2 -0
@@ -69,6 +69,8 @@#define DIV_ROUND_UP_ULL (ll, d) DIV_ROUND_DOWN_ULL((ll) + (d) - 1, (d)) +#define ROUND (a, b) (((a) + (b) - 1) & ~((b) - 1)) +#if BITS_PER_LONG ==32 # define DIV_ROUND_UP_SECTOR_T (ll,d) DIV_ROUND_UP_ULL(ll, d)#else
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 32/35 common: Move ROUND() into kernel.h
Quoted 3 lines · Simon Glass
Move this macro in with all the other rounding macros.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/1b7283ac/attachment-0001.sig>
PATCH v2 33/35 common: Move and rename CONFIG_SYS_SUPPORT_64BIT_DATA
In reply to Simon GlassThis is not really a CONFIG since it is not intended to be set by boards. Move it into the compiler header with other similar defines, and rename it.
---
Changes in v2: None
README | 2 +- cmd/mem.c | 54 ++++++++++++++++++------------------ common/command.c | 2 +- include/common.h | 4 --- include/compiler.h | 4 +++ lib/display_options.c | 8 +++--- scripts/config_whitelist.txt | 1 - 7 files changed, 37 insertions(+), 38 deletions(-)
README +1 -1
@@ -2460,7 +2460,7 @@ typically in board_init_f() and board_init_r(). Configuration Settings: ----------------------- -- CONFIG_SYS_SUPPORT_64BIT_DATA: Defined automatically if compiled as 64-bit. +- MEM_SUPPORT_64BIT_DATA: Defined automatically if compiled as 64-bit. Optionally it can be defined to support 64-bit memory commands. - CONFIG_SYS_LONGHELP: Defined when you want long help messages included;
cmd/mem.c +27 -27
216 lines not on this page · raw message
common/command.c +1 -1
@@ -469,7 +469,7 @@ int cmd_get_data_size(char* arg, int default_size)return 2 ;case 'l' :return 4 ; -#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA +#ifdef MEM_SUPPORT_64BIT_DATA case 'q' :return 8 ;#endif
include/common.h +0 -4
@@ -35,10 +35,6 @@#include <flash.h> #include <image.h> -#ifdef __LP64__ -#define CONFIG_SYS_SUPPORT_64BIT_DATA -#endif -#include <log.h> #include <asm/u-boot.h> /* boot information for Linux kernel */
include/compiler.h +4 -0
@@ -144,4 +144,8 @@ typedef unsigned long int uintptr_t;#define likely (x) __builtin_expect(!!(x), 1)#define unlikely (x) __builtin_expect(!!(x), 0) +#ifdef __LP64__ +#define MEM_SUPPORT_64BIT_DATA +#endif +#endif
lib/display_options.c +4 -4
@@ -137,7 +137,7 @@ int print_buffer(ulong addr, const void *data, uint width, uint count, {/* linebuf as a union causes proper alignment */ union linebuf { -#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA +#ifdef MEM_SUPPORT_64BIT_DATA uint64_t uq[MAX_LINE_LENGTH_BYTES /sizeof (uint64_t ) +1 ];#endif uint32_t ui[MAX_LINE_LENGTH_BYTES /sizeof (uint32_t ) +1 ];
@@ -145,7 +145,7 @@ int print_buffer(ulong addr, const void *data, uint width, uint count,uint8_t uc[MAX_LINE_LENGTH_BYTES /sizeof (uint8_t ) +1 ]; } lb;int i; -#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA +#ifdef MEM_SUPPORT_64BIT_DATA uint64_t __maybe_unused x;#else uint32_t __maybe_unused x;
@@ -168,7 +168,7 @@ int print_buffer(ulong addr, const void *data, uint width, uint count,for (i =0 ; i < thislinelen; i++) {if (width ==4 ) x = lb.ui[i] = *(volatile uint32_t *)data; -#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA +#ifdef MEM_SUPPORT_64BIT_DATA else if (width == 8) x = lb.uq[i] = *(volatile uint64_t *)data;#endif
@@ -178,7 +178,7 @@ int print_buffer(ulong addr, const void *data, uint width, uint count, x = lb.uc[i] = *(volatile uint8_t *)data;#if defined(CONFIG_SPL_BUILD )printf (" %x" , (uint )x); -#elif defined(CONFIG_SYS_SUPPORT_64BIT_DATA ) +#elif defined(MEM_SUPPORT_64BIT_DATA )printf (" %0*llx" , width *2 , (long long )x);#else printf (" %0*x" , width *2 , x);
scripts/config_whitelist.txt +0 -1
@@ -3895,7 +3895,6 @@ CONFIG_SYS_STACK_SIZE CONFIG_SYS_STATUS_C CONFIG_SYS_STATUS_OK CONFIG_SYS_STMICRO_BOOT -CONFIG_SYS_SUPPORT_64BIT_DATA CONFIG_SYS_SXCNFG_VAL CONFIG_SYS_TBIPA_VALUE CONFIG_SYS_TCLK
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 33/35 common: Move and rename CONFIG_SYS_SUPPORT_64BIT_DATA
Quoted 5 lines · Simon Glass
This is not really a CONFIG since it is not intended to be set by boards. Move it into the compiler header with other similar defines, and rename it.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/4ba741c9/attachment.sig>
PATCH v2 34/35 common: Collect all the header files together
In reply to Simon GlassThere are many header files included here. Put them all together since the blank lines are not useful.
---
Changes in v2: None
include/common.h | 24 ------------------------ 1 file changed, 24 deletions(-)
include/common.h +0 -24
@@ -14,7 +14,6 @@#define __COMMON_H_ 1#ifndef __ASSEMBLY__/* put C only stuff in this section */ -#include <config.h> #include <errno.h> #include <time.h>
@@ -30,43 +29,20 @@#include <stdarg.h> #include <stdio.h> #include <linux/kernel.h> -#include <part.h> #include <flash.h> #include <image.h> -#include <log.h> -#include <asm/u-boot.h> /* boot information for Linux kernel */ #include <asm/global_data.h> /* global data used for startup functions */ - -/* startup functions, used in: -* common/board_f.c -* common/init/board_init.c -* common/board_r.c -* common/board_info.c -*/ #include <init.h> -#include <display_options.h> - -/* lib/uuid.c */ #include <uuid.h> - -/* lib/vsprintf.c */ #include <vsprintf.h> - -/* lib/net_utils.c */ #include <net.h> -#include <bootstage.h> - -#else /* __ASSEMBLY__ */ -#endif /* __ASSEMBLY__ */ -/* Put only stuff here that the assembler can digest */ -/* Pull in stuff for the build system */ #ifdef DO_DEPS_ONLY # include <env_internal.h>
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 34/35 common: Collect all the header files together
Quoted 4 lines · Simon Glass
There are many header files included here. Put them all together since the blank lines are not useful.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/2bd11370/attachment.sig>
PATCH v2 35/35 common: Update comment to show progress
In reply to Simon GlassThis file doesn't include any declarations anymore but it does include other headers. Update the header comment to mention this.
---
Changes in v2: None
include/common.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
include/common.h +2 -3
@@ -2,9 +2,8 @@/* * Common header file for U-Boot * -* This file still includes quite a bit of stuff that should be in separate -* headers. Please think before adding more things. -* Patches to remove things are welcome. +* This file still includes quite a few headers that should be included +* individually as needed. Patches to remove things are welcome. * * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 35/35 common: Update comment to show progress
Quoted 4 lines · Simon Glass
This file doesn't include any declarations anymore but it does include other headers. Update the header comment to mention this.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200120/616534fd/attachment.sig>