common: Further reduce common.h
Subsystems (69)
v2 cover common: Further reduce common.h
This series drops the size of common.h down further, by moving things out into existing and new header files.
It is now down to about 200 lines.
Changes in v2:
- Move trap_init() into init.h instead; update commit message
Simon Glass (41):
common: Move legacy CPU functions to their own header Drop CONFIG_SHOW_ACTIVITY
common: Drop global inclusion of status_led.h
status_led: Tidy up the code style
common: Move random-number functions into their own header
common: Drop linux/crc8.h
crc: Fix code style with crc functions
crc32: Use the crc.h header for crc functions
spl: bootcount: Move code out of header file
common: Move bootcount functions to their header file
common: Move sorting functions to their own header file Move strtomhz() to vsprintf.h
common: Move env_get_ip() to net.h
serial: usb: Correct the usbtty_...() prototypes
common: Move serial_printf() to the serial header
common: Move serial functions out of common.h
common: Add a new lz4.h header file
common: Move some time functions out of common.h
common: Move wait_ticks functions out of common.h
common: Move timer_get_us() function out of common.h
common: Move get_ticks() function out of common.h
common: Move mii_init() function out of common.h
common: Move some CPU functions out of common.h
common: Drop cpu_init()
common: Move checkcpu() out of common.h
common: Move some SMP functions out of common.h
arm: powerpc: Tidy up code style for cache functions
common: Move some cache and MMU functions out of common.h
common: Drop checkicache() and checkdcache()
common: Move ARM cache operations out of common.h
arm: powerpc: Tidy up code style for interrupt functions
common: Move interrupt functions into a new header
common: Move enable/disable_interrupts out of common.h
common: Move command functions out of common.h
common: Drop board_show_dram()
common: Move board_get_usable_ram_top() out of common.h
common: Move some board functions out of common.h
common: Move pci_init_board() out of common.h
common: Move trap_init() out of common.h
common: Drop get_endaddr()
common: Move old EEPROM functions into a new header
README | 2 +- api/api.c | 1 + arch/arc/lib/bootm.c | 1 + arch/arc/lib/cache.c | 1 + arch/arc/lib/cpu.c | 1 + arch/arc/lib/interrupts.c | 1 + arch/arm/cpu/arm11/cpu.c | 4 +- arch/arm/cpu/arm920t/cpu.c | 4 +- arch/arm/cpu/arm920t/ep93xx/timer.c | 1 + arch/arm/cpu/arm920t/imx/timer.c | 1 + arch/arm/cpu/arm926ejs/armada100/cpu.c | 1 + arch/arm/cpu/arm926ejs/armada100/timer.c | 1 + arch/arm/cpu/arm926ejs/cache.c | 1 + arch/arm/cpu/arm926ejs/cpu.c | 4 +- arch/arm/cpu/arm926ejs/lpc32xx/cpu.c | 1 + arch/arm/cpu/arm926ejs/lpc32xx/timer.c | 1 + arch/arm/cpu/arm926ejs/mx25/generic.c | 1 + arch/arm/cpu/arm926ejs/mx27/generic.c | 1 + arch/arm/cpu/arm926ejs/mx27/timer.c | 1 + arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 1 + arch/arm/cpu/arm926ejs/mxs/timer.c | 1 + arch/arm/cpu/arm926ejs/spear/spr_misc.c | 1 + arch/arm/cpu/arm926ejs/spear/timer.c | 1 + arch/arm/cpu/arm946es/cpu.c | 4 +- arch/arm/cpu/armv7/arch_timer.c | 1 + arch/arm/cpu/armv7/cache_v7.c | 1 + arch/arm/cpu/armv7/cpu.c | 2 + arch/arm/cpu/armv7/exception_level.c | 1 + .../cpu/armv7/iproc-common/hwinit-common.c | 1 + arch/arm/cpu/armv7/iproc-common/timer.c | 1 + .../arm/cpu/armv7/kona-common/hwinit-common.c | 1 + arch/arm/cpu/armv7/ls102xa/cpu.c | 2 + arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c | 1 + arch/arm/cpu/armv7/ls102xa/timer.c | 1 + arch/arm/cpu/armv7/mpu_v7r.c | 1 + arch/arm/cpu/armv7/s5p-common/timer.c | 1 + arch/arm/cpu/armv7/stv0991/timer.c | 1 + arch/arm/cpu/armv7/sunxi/timer.c | 1 + arch/arm/cpu/armv7/vf610/generic.c | 1 + arch/arm/cpu/armv7/vf610/timer.c | 1 + arch/arm/cpu/armv7/virt-v7.c | 1 + arch/arm/cpu/armv7m/cache.c | 1 + arch/arm/cpu/armv7m/cpu.c | 2 + arch/arm/cpu/armv7m/systick-timer.c | 1 + arch/arm/cpu/armv8/cache_v8.c | 1 + arch/arm/cpu/armv8/cpu.c | 2 + arch/arm/cpu/armv8/exception_level.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 3 + .../armv8/fsl-layerscape/fsl_lsch2_speed.c | 1 + .../armv8/fsl-layerscape/fsl_lsch3_speed.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/mp.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/soc.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/spl.c | 1 + arch/arm/cpu/armv8/generic_timer.c | 1 + arch/arm/cpu/armv8/s32v234/cpu.c | 1 + arch/arm/cpu/armv8/sec_firmware.c | 1 + arch/arm/cpu/pxa/cache.c | 1 + arch/arm/cpu/pxa/pxa2xx.c | 3 + arch/arm/cpu/sa1100/cpu.c | 4 +- arch/arm/cpu/sa1100/timer.c | 1 + arch/arm/lib/bootm.c | 1 + arch/arm/lib/cache-cp15.c | 13 +- arch/arm/lib/cache.c | 1 + arch/arm/lib/interrupts.c | 7 +- arch/arm/lib/interrupts_64.c | 1 + arch/arm/lib/interrupts_m.c | 1 + arch/arm/lib/reset.c | 1 + arch/arm/mach-at91/arm920t/timer.c | 1 + arch/arm/mach-at91/arm926ejs/cpu.c | 1 + arch/arm/mach-at91/armv7/cpu.c | 2 + arch/arm/mach-bcm283x/init.c | 1 + arch/arm/mach-bcm283x/mbox.c | 1 + arch/arm/mach-davinci/timer.c | 1 + arch/arm/mach-exynos/soc.c | 1 + arch/arm/mach-imx/cache.c | 1 + arch/arm/mach-imx/imx8/cpu.c | 1 + arch/arm/mach-imx/imx8m/soc.c | 1 + arch/arm/mach-imx/mx5/soc.c | 1 + arch/arm/mach-imx/mx6/mp.c | 1 + arch/arm/mach-imx/mx6/opos6ul.c | 1 + arch/arm/mach-imx/mx6/soc.c | 1 + arch/arm/mach-imx/mx7/psci-mx7.c | 1 + arch/arm/mach-imx/mx7ulp/soc.c | 1 + arch/arm/mach-imx/syscounter.c | 1 + arch/arm/mach-imx/timer.c | 1 + arch/arm/mach-keystone/init.c | 1 + arch/arm/mach-kirkwood/cpu.c | 1 + arch/arm/mach-mediatek/cpu.c | 1 + arch/arm/mach-meson/board-common.c | 2 + arch/arm/mach-mvebu/arm64-common.c | 1 + arch/arm/mach-mvebu/armada8k/cpu.c | 1 + arch/arm/mach-mvebu/cpu.c | 1 + arch/arm/mach-omap2/omap-cache.c | 1 + arch/arm/mach-omap2/sec-common.c | 1 + arch/arm/mach-omap2/timer.c | 1 + arch/arm/mach-orion5x/cpu.c | 1 + arch/arm/mach-orion5x/timer.c | 1 + arch/arm/mach-rmobile/cpu_info.c | 1 + arch/arm/mach-rmobile/memmap-gen3.c | 1 + arch/arm/mach-rmobile/timer.c | 1 + arch/arm/mach-rockchip/board.c | 2 + arch/arm/mach-rockchip/misc.c | 1 + arch/arm/mach-rockchip/rk3288/rk3288.c | 1 + arch/arm/mach-rockchip/sdram_common.c | 1 + arch/arm/mach-s5pc1xx/cache.c | 1 + arch/arm/mach-socfpga/clock_manager_gen5.c | 1 + arch/arm/mach-socfpga/misc.c | 1 + arch/arm/mach-socfpga/spl_a10.c | 1 + arch/arm/mach-stm32mp/cpu.c | 1 + arch/arm/mach-sunxi/board.c | 1 + arch/arm/mach-sunxi/dram_helpers.c | 1 + arch/arm/mach-sunxi/p2wi.c | 1 + arch/arm/mach-sunxi/rsb.c | 1 + arch/arm/mach-tegra/board.c | 1 + arch/arm/mach-tegra/board2.c | 1 + arch/arm/mach-tegra/clock.c | 1 + arch/arm/mach-tegra/cmd_enterrcm.c | 1 + arch/arm/mach-tegra/ivc.c | 1 + arch/arm/mach-uniphier/arm32/cache-uniphier.c | 1 + arch/arm/mach-uniphier/arm32/psci.c | 1 + arch/arm/mach-uniphier/board_late_init.c | 1 + arch/arm/mach-zynq/cpu.c | 1 + arch/arm/mach-zynqmp/mp.c | 1 + arch/arm/mach-zynqmp/spl.c | 1 + arch/m68k/cpu/mcf5227x/cpu.c | 1 + arch/m68k/cpu/mcf5227x/cpu_init.c | 1 + arch/m68k/cpu/mcf5227x/interrupts.c | 1 + arch/m68k/cpu/mcf523x/cpu.c | 1 + arch/m68k/cpu/mcf523x/cpu_init.c | 1 + arch/m68k/cpu/mcf523x/interrupts.c | 1 + arch/m68k/cpu/mcf52x2/cpu.c | 1 + arch/m68k/cpu/mcf52x2/cpu_init.c | 1 + arch/m68k/cpu/mcf52x2/interrupts.c | 1 + arch/m68k/cpu/mcf530x/cpu.c | 1 + arch/m68k/cpu/mcf530x/cpu_init.c | 1 + arch/m68k/cpu/mcf530x/interrupts.c | 1 + arch/m68k/cpu/mcf532x/cpu.c | 1 + arch/m68k/cpu/mcf532x/cpu_init.c | 1 + arch/m68k/cpu/mcf532x/interrupts.c | 1 + arch/m68k/cpu/mcf5445x/cpu.c | 1 + arch/m68k/cpu/mcf5445x/cpu_init.c | 1 + arch/m68k/cpu/mcf5445x/interrupts.c | 1 + arch/m68k/cpu/mcf547x_8x/cpu.c | 1 + arch/m68k/cpu/mcf547x_8x/cpu_init.c | 1 + arch/m68k/cpu/mcf547x_8x/interrupts.c | 1 + arch/m68k/cpu/mcf547x_8x/slicetimer.c | 1 + arch/m68k/lib/cache.c | 1 + arch/m68k/lib/interrupts.c | 9 +- arch/m68k/lib/time.c | 2 + arch/m68k/lib/traps.c | 1 + arch/microblaze/cpu/cache.c | 19 +- arch/microblaze/cpu/interrupts.c | 1 + arch/microblaze/cpu/timer.c | 1 + arch/microblaze/include/asm/microblaze_intc.h | 2 + arch/microblaze/lib/bootm.c | 1 + arch/mips/cpu/interrupts.c | 1 + arch/mips/lib/cache.c | 1 + arch/mips/lib/reloc.c | 1 + arch/mips/lib/traps.c | 2 + arch/mips/mach-jz47xx/jz4780/jz4780.c | 2 + arch/mips/mach-jz47xx/jz4780/timer.c | 2 + arch/mips/mach-mtmips/ddr_calibrate.c | 1 + arch/nds32/cpu/n1213/ae3xx/cpu.c | 2 + arch/nds32/cpu/n1213/ag101/cpu.c | 2 + arch/nds32/cpu/n1213/ag101/timer.c | 2 + arch/nds32/lib/cache.c | 1 + arch/nds32/lib/interrupts.c | 1 + arch/nios2/cpu/cpu.c | 2 + arch/nios2/cpu/interrupts.c | 15 +- arch/nios2/lib/bootm.c | 2 + arch/nios2/lib/cache.c | 1 + arch/powerpc/cpu/mpc83xx/cpu.c | 5 +- arch/powerpc/cpu/mpc83xx/ecc.c | 1 + arch/powerpc/cpu/mpc83xx/interrupts.c | 7 +- arch/powerpc/cpu/mpc83xx/spd_sdram.c | 2 + arch/powerpc/cpu/mpc83xx/speed.c | 1 + arch/powerpc/cpu/mpc85xx/cpu.c | 3 + arch/powerpc/cpu/mpc85xx/cpu_init.c | 1 + arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c | 1 + arch/powerpc/cpu/mpc85xx/interrupts.c | 1 + arch/powerpc/cpu/mpc85xx/mp.c | 1 + arch/powerpc/cpu/mpc85xx/speed.c | 1 + arch/powerpc/cpu/mpc85xx/traps.c | 1 + arch/powerpc/cpu/mpc86xx/cpu.c | 2 + arch/powerpc/cpu/mpc86xx/interrupts.c | 3 +- arch/powerpc/cpu/mpc86xx/mp.c | 1 + arch/powerpc/cpu/mpc8xx/cache.c | 1 + arch/powerpc/cpu/mpc8xx/cpu.c | 132 +++++------ arch/powerpc/cpu/mpc8xx/interrupts.c | 1 + arch/powerpc/cpu/mpc8xxx/cpu.c | 1 + arch/powerpc/cpu/mpc8xxx/fdt.c | 1 + arch/powerpc/cpu/mpc8xxx/srio.c | 1 + arch/powerpc/lib/bootm.c | 1 + arch/powerpc/lib/cache.c | 1 + arch/powerpc/lib/interrupts.c | 24 +- arch/powerpc/lib/time.c | 1 + arch/riscv/cpu/ax25/cache.c | 1 + arch/riscv/cpu/ax25/cpu.c | 2 + arch/riscv/cpu/generic/cpu.c | 1 + arch/riscv/cpu/generic/dram.c | 1 + arch/riscv/lib/cache.c | 1 + arch/riscv/lib/interrupts.c | 1 + arch/riscv/lib/smp.c | 1 + arch/riscv/lib/spl.c | 1 + arch/sandbox/cpu/cpu.c | 1 + arch/sandbox/cpu/start.c | 1 + arch/sandbox/lib/interrupts.c | 1 + arch/sh/cpu/sh4/cache.c | 1 + arch/sh/cpu/sh4/cpu.c | 2 + arch/sh/cpu/sh4/interrupts.c | 7 +- arch/sh/lib/time_sh2.c | 1 + arch/sh/lib/zimageboot.c | 1 + arch/x86/cpu/broadwell/cpu_from_spl.c | 1 + arch/x86/cpu/broadwell/sdram.c | 1 + arch/x86/cpu/coreboot/coreboot.c | 1 + arch/x86/cpu/coreboot/sdram.c | 1 + arch/x86/cpu/cpu.c | 1 + arch/x86/cpu/efi/app.c | 1 + arch/x86/cpu/efi/payload.c | 2 + arch/x86/cpu/efi/sdram.c | 1 + arch/x86/cpu/i386/cpu.c | 1 + arch/x86/cpu/i386/interrupt.c | 1 + arch/x86/cpu/intel_common/mrc.c | 1 + arch/x86/cpu/ivybridge/cpu.c | 1 + arch/x86/cpu/ivybridge/sdram.c | 1 + arch/x86/cpu/mtrr.c | 1 + arch/x86/cpu/qemu/dram.c | 1 + arch/x86/cpu/qemu/qemu.c | 1 + arch/x86/cpu/quark/dram.c | 2 + arch/x86/cpu/quark/quark.c | 2 + arch/x86/cpu/slimbootloader/sdram.c | 1 + arch/x86/cpu/slimbootloader/slimbootloader.c | 1 + arch/x86/cpu/tangier/tangier.c | 1 + arch/x86/cpu/x86_64/cpu.c | 2 + arch/x86/cpu/x86_64/interrupts.c | 1 + arch/x86/lib/bios.c | 1 + arch/x86/lib/fsp/fsp_common.c | 1 + arch/x86/lib/fsp/fsp_dram.c | 1 + arch/x86/lib/init_helpers.c | 1 + arch/x86/lib/interrupts.c | 1 + arch/x86/lib/spl.c | 2 + arch/x86/lib/zimage.c | 1 + arch/xtensa/cpu/cpu.c | 1 + arch/xtensa/cpu/exceptions.c | 1 + arch/xtensa/lib/bootm.c | 1 + arch/xtensa/lib/cache.c | 1 + arch/xtensa/lib/time.c | 1 + board/Arcturus/ucp1020/cmd_arc.c | 1 + board/Arcturus/ucp1020/ddr.c | 1 + board/Arcturus/ucp1020/ucp1020.c | 1 + board/BuR/brppt1/board.c | 2 + board/BuR/brsmarc1/board.c | 1 + board/BuR/brxre1/board.c | 1 + board/CZ.NIC/turris_mox/turris_mox.c | 1 + board/CZ.NIC/turris_omnia/turris_omnia.c | 2 + board/Marvell/mvebu_armada-8k/board.c | 1 + board/advantech/dms-ba16/dms-ba16.c | 1 + board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c | 1 + board/amarula/vyasa-rk3288/vyasa-rk3288.c | 1 + board/aristainetos/aristainetos-v2.c | 1 + board/armadeus/apf27/apf27.c | 1 + board/armadeus/opos6uldev/board.c | 3 +- board/armltd/integrator/integrator.c | 3 +- board/armltd/integrator/pci.c | 1 + board/armltd/integrator/timer.c | 1 + board/armltd/vexpress/vexpress_common.c | 1 + board/astro/mcf5373l/mcf5373l.c | 1 + .../armadillo-800eva/armadillo-800eva.c | 1 + board/atmel/at91sam9261ek/at91sam9261ek.c | 1 + board/atmel/at91sam9261ek/led.c | 1 + board/atmel/at91sam9263ek/at91sam9263ek.c | 1 + board/atmel/at91sam9263ek/led.c | 1 + .../atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 1 + board/atmel/at91sam9m10g45ek/led.c | 1 + board/atmel/at91sam9n12ek/at91sam9n12ek.c | 1 + board/atmel/at91sam9rlek/at91sam9rlek.c | 1 + board/atmel/at91sam9rlek/led.c | 1 + board/atmel/at91sam9x5ek/at91sam9x5ek.c | 1 + board/atmel/common/mac_eeprom.c | 1 + board/atmel/common/video_display.c | 1 + .../atmel/sama5d27_som1_ek/sama5d27_som1_ek.c | 1 + board/atmel/sama5d2_icp/sama5d2_icp.c | 1 + board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c | 1 + .../atmel/sama5d2_xplained/sama5d2_xplained.c | 1 + .../atmel/sama5d3_xplained/sama5d3_xplained.c | 1 + board/atmel/sama5d3xek/sama5d3xek.c | 1 + .../atmel/sama5d4_xplained/sama5d4_xplained.c | 1 + board/atmel/sama5d4ek/sama5d4ek.c | 1 + board/beckhoff/mx53cx9020/mx53cx9020.c | 2 + board/birdland/bav335x/board.c | 2 + board/bluewater/gurnard/gurnard.c | 1 + board/bosch/shc/board.c | 2 + board/broadcom/bcm_ep/board.c | 1 + board/broadcom/bcmstb/bcmstb.c | 3 + board/bticino/mamoj/spl.c | 1 + board/cadence/xtfpga/xtfpga.c | 1 + board/cavium/thunderx/thunderx.c | 1 + board/ccv/xpress/xpress.c | 1 + .../popmetal_rk3288/popmetal-rk3288.c | 1 + board/cirrus/edb93xx/edb93xx.c | 3 + board/cobra5272/flash.c | 22 +- board/compulab/cl-som-imx7/cl-som-imx7.c | 1 + board/compulab/cm_fx6/cm_fx6.c | 1 + board/compulab/cm_t335/cm_t335.c | 1 + board/compulab/common/eeprom.c | 1 + board/congatec/cgtqmx6eval/cgtqmx6eval.c | 1 + .../conga-qeval20-qa3.c | 1 + board/coreboot/coreboot/coreboot.c | 1 + board/corscience/tricorder/tricorder-eeprom.c | 2 + board/corscience/tricorder/tricorder.c | 1 + board/cssi/MCR3000/MCR3000.c | 2 + board/dfi/dfi-bt700/dfi-bt700.c | 1 + board/dhelectronics/dh_imx6/dh_imx6.c | 2 + board/eets/pdu001/board.c | 1 + board/efi/efi-x86_payload/payload.c | 1 + board/el/el6x/el6x.c | 1 + board/embest/mx6boards/mx6boards.c | 1 + board/emulation/qemu-riscv/qemu-riscv.c | 1 + board/engicam/common/board.c | 2 + board/engicam/common/spl.c | 1 + board/esd/meesc/meesc.c | 2 + board/esd/vme8349/pci.c | 1 + board/freescale/b4860qds/b4860qds.c | 2 + board/freescale/b4860qds/pci.c | 1 + board/freescale/bsc9131rdb/ddr.c | 1 + board/freescale/bsc9132qds/bsc9132qds.c | 1 + board/freescale/bsc9132qds/ddr.c | 1 + board/freescale/c29xpcie/c29xpcie.c | 1 + board/freescale/common/p_corenet/pci.c | 1 + board/freescale/common/sys_eeprom.c | 1 + board/freescale/common/vid.c | 1 + board/freescale/corenet_ds/corenet_ds.c | 1 + board/freescale/corenet_ds/ddr.c | 1 + board/freescale/imx8mq_evk/imx8mq_evk.c | 1 + board/freescale/imx8qm_mek/imx8qm_mek.c | 1 + board/freescale/imx8qxp_mek/imx8qxp_mek.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/ls1043ardb/ddr.c | 1 + board/freescale/m5253demo/flash.c | 1 + board/freescale/m54455evb/m54455evb.c | 1 + board/freescale/m547xevb/m547xevb.c | 1 + board/freescale/m548xevb/m548xevb.c | 1 + board/freescale/mpc8308rdb/mpc8308rdb.c | 1 + board/freescale/mpc8313erdb/mpc8313erdb.c | 1 + board/freescale/mpc8315erdb/mpc8315erdb.c | 1 + board/freescale/mpc8323erdb/mpc8323erdb.c | 3 + board/freescale/mpc832xemds/mpc832xemds.c | 1 + board/freescale/mpc832xemds/pci.c | 1 + board/freescale/mpc8349emds/pci.c | 1 + board/freescale/mpc8349itx/pci.c | 1 + board/freescale/mpc837xemds/mpc837xemds.c | 1 + board/freescale/mpc837xemds/pci.c | 1 + board/freescale/mpc837xerdb/pci.c | 1 + board/freescale/mpc8536ds/mpc8536ds.c | 1 + board/freescale/mpc8541cds/mpc8541cds.c | 2 + board/freescale/mpc8544ds/mpc8544ds.c | 1 + board/freescale/mpc8548cds/mpc8548cds.c | 2 + board/freescale/mpc8555cds/mpc8555cds.c | 2 + board/freescale/mpc8568mds/mpc8568mds.c | 1 + board/freescale/mpc8569mds/mpc8569mds.c | 1 + board/freescale/mpc8572ds/mpc8572ds.c | 1 + board/freescale/mpc8610hpcd/mpc8610hpcd.c | 1 + board/freescale/mpc8641hpcn/mpc8641hpcn.c | 1 + board/freescale/mx25pdk/mx25pdk.c | 1 + board/freescale/mx31pdk/mx31pdk.c | 1 + board/freescale/mx35pdk/mx35pdk.c | 1 + board/freescale/mx51evk/mx51evk.c | 1 + board/freescale/mx53evk/mx53evk.c | 1 + board/freescale/mx53loco/mx53loco.c | 1 + board/freescale/mx6sabreauto/mx6sabreauto.c | 1 + board/freescale/mx6sabresd/mx6sabresd.c | 1 + board/freescale/mx6sllevk/mx6sllevk.c | 1 + .../freescale/mx6sxsabreauto/mx6sxsabreauto.c | 1 + board/freescale/mx6sxsabresd/mx6sxsabresd.c | 1 + .../mx6ul_14x14_evk/mx6ul_14x14_evk.c | 1 + board/freescale/mx6ullevk/mx6ullevk.c | 1 + board/freescale/mx7dsabresd/mx7dsabresd.c | 1 + board/freescale/p1010rdb/ddr.c | 1 + board/freescale/p1010rdb/p1010rdb.c | 1 + board/freescale/p1022ds/p1022ds.c | 1 + board/freescale/p1023rdb/p1023rdb.c | 1 + board/freescale/p1_p2_rdb_pc/ddr.c | 1 + board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 1 + board/freescale/p1_twr/ddr.c | 1 + board/freescale/p1_twr/p1_twr.c | 1 + board/freescale/p2041rdb/p2041rdb.c | 1 + board/freescale/qemu-ppce500/qemu-ppce500.c | 2 + board/freescale/t102xqds/pci.c | 1 + board/freescale/t102xqds/t102xqds.c | 1 + board/freescale/t102xrdb/pci.c | 1 + board/freescale/t102xrdb/t102xrdb.c | 1 + board/freescale/t1040qds/pci.c | 1 + board/freescale/t1040qds/t1040qds.c | 1 + board/freescale/t104xrdb/pci.c | 1 + board/freescale/t104xrdb/t104xrdb.c | 1 + board/freescale/t208xqds/pci.c | 1 + board/freescale/t208xqds/t208xqds.c | 1 + board/freescale/t208xrdb/pci.c | 1 + board/freescale/t208xrdb/t208xrdb.c | 1 + board/freescale/t4qds/pci.c | 1 + board/freescale/t4qds/t4240emu.c | 1 + board/freescale/t4qds/t4240qds.c | 2 + board/freescale/t4rdb/pci.c | 1 + board/freescale/t4rdb/t4240rdb.c | 1 + board/gardena/smart-gateway-at91sam/board.c | 1 + board/gardena/smart-gateway-mt7688/board.c | 2 + board/gdsys/a38x/controlcenterdc.c | 1 + board/gdsys/a38x/hre.c | 1 + board/gdsys/a38x/keyprogram.c | 1 + board/gdsys/mpc8308/gazerbeam.c | 1 + board/gdsys/mpc8308/hrcon.c | 1 + board/gdsys/mpc8308/mpc8308.c | 1 + board/gdsys/mpc8308/strider.c | 1 + board/gdsys/p1022/controlcenterd-id.c | 2 + board/gdsys/p1022/controlcenterd.c | 1 + board/ge/bx50v3/bx50v3.c | 1 + board/ge/mx53ppd/mx53ppd.c | 1 + board/grinn/chiliboard/board.c | 1 + board/grinn/liteboard/board.c | 2 + board/gumstix/pepper/board.c | 1 + board/highbank/highbank.c | 1 + board/imgtec/boston/ddr.c | 1 + board/imgtec/malta/malta.c | 1 + board/intel/edison/edison.c | 1 + board/intel/slimbootloader/slimbootloader.c | 1 + board/inversepath/usbarmory/usbarmory.c | 1 + board/isee/igep003x/board.c | 2 + board/isee/igep00x0/spl.c | 1 + board/k+p/kp_imx53/kp_imx53.c | 1 + board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c | 1 + board/keymile/km83xx/km83xx.c | 1 + board/keymile/km_arm/km_arm.c | 1 + board/keymile/kmp204x/kmp204x.c | 1 + board/keymile/kmp204x/pci.c | 1 + board/kosagi/novena/novena.c | 2 + board/kosagi/novena/novena_spl.c | 1 + board/laird/wb50n/wb50n.c | 1 + board/liebherr/display5/spl.c | 1 + board/liebherr/mccmon6/mccmon6.c | 2 + board/liebherr/mccmon6/spl.c | 1 + board/logicpd/am3517evm/am3517evm.c | 1 + board/logicpd/imx6/imx6logic.c | 2 + board/logicpd/omap3som/omap3logic.c | 2 + board/menlo/m53menlo/m53menlo.c | 1 + board/mini-box/picosam9g45/led.c | 1 + board/mini-box/picosam9g45/picosam9g45.c | 1 + board/mpc8308_p1m/mpc8308_p1m.c | 1 + board/mscc/jr2/jr2.c | 1 + board/mscc/luton/luton.c | 1 + board/mscc/ocelot/ocelot.c | 1 + board/mscc/serval/serval.c | 1 + board/mscc/servalt/servalt.c | 1 + board/overo/common.c | 1 + board/phytec/pcm052/pcm052.c | 1 + board/phytec/pcm058/pcm058.c | 1 + board/phytec/pfla02/pfla02.c | 2 + board/phytec/phycore_rk3288/phycore-rk3288.c | 2 + .../dragonboard410c/dragonboard410c.c | 1 + board/raspberrypi/rpi/rpi.c | 1 + board/renesas/r2dplus/r2dplus.c | 1 + board/renesas/r7780mp/r7780mp.c | 1 + board/renesas/sh7752evb/sh7752evb.c | 1 + board/renesas/sh7753evb/sh7753evb.c | 1 + board/renesas/sh7757lcr/sh7757lcr.c | 1 + board/rockchip/kylin_rk3036/kylin_rk3036.c | 1 + board/rockchip/tinker_rk3288/tinker-rk3288.c | 2 + board/ronetix/pm9261/led.c | 1 + board/ronetix/pm9261/pm9261.c | 1 + board/ronetix/pm9263/led.c | 1 + board/samsung/arndale/arndale.c | 1 + board/samsung/common/board.c | 1 + board/samsung/common/misc.c | 1 + board/sandbox/sandbox.c | 2 + board/sbc8349/pci.c | 1 + board/sbc8548/sbc8548.c | 1 + board/sbc8641d/sbc8641d.c | 1 + board/siemens/common/board.c | 1 + board/siemens/draco/board.c | 1 + board/siemens/pxm2/board.c | 1 + board/siemens/rut/board.c | 1 + board/silica/pengwyn/board.c | 1 + board/softing/vining_2000/vining_2000.c | 1 + board/softing/vining_fpga/socfpga.c | 3 + board/solidrun/mx6cuboxi/mx6cuboxi.c | 1 + board/spear/x600/x600.c | 1 + board/st/stih410-b2260/board.c | 1 + board/st/stm32f429-discovery/led.c | 1 + board/st/stm32f746-disco/stm32f746-disco.c | 2 + board/st/stm32h743-disco/stm32h743-disco.c | 1 + board/st/stm32h743-eval/stm32h743-eval.c | 1 + board/st/stm32mp1/stm32mp1.c | 1 + board/sunxi/board.c | 1 + board/synopsys/axs10x/axs10x.c | 1 + board/synopsys/hsdk/hsdk.c | 3 + board/syteco/zmx25/zmx25.c | 2 + board/tcl/sl50/board.c | 2 + board/technexion/pico-imx7d/pico-imx7d.c | 1 + board/theadorable/theadorable.c | 3 +- .../puma_rk3399/puma-rk3399.c | 1 + board/ti/am335x/board.c | 1 + board/ti/am43xx/board.c | 2 + board/ti/am57xx/board.c | 2 + board/ti/am65x/evm.c | 1 + board/ti/beagle/beagle.c | 1 + board/ti/common/board_detect.c | 1 + board/ti/dra7xx/evm.c | 2 + board/ti/evm/evm.c | 1 + board/ti/j721e/evm.c | 1 + board/ti/ks2_evm/board_k2g.c | 2 + board/toradex/apalis-imx8/apalis-imx8.c | 1 + board/toradex/apalis_imx6/apalis_imx6.c | 1 + .../toradex/colibri-imx6ull/colibri-imx6ull.c | 1 + board/toradex/colibri-imx8x/colibri-imx8x.c | 1 + board/toradex/colibri_imx6/colibri_imx6.c | 1 + board/toradex/colibri_pxa270/colibri_pxa270.c | 1 + board/toradex/colibri_vf/colibri_vf.c | 1 + board/tqc/tqm834x/pci.c | 1 + board/tqc/tqma6/tqma6.c | 1 + board/tqc/tqma6/tqma6_mba6.c | 1 + board/tqc/tqma6/tqma6_wru4.c | 1 + board/udoo/neo/neo.c | 1 + board/udoo/udoo.c | 1 + board/varisys/common/sys_eeprom.c | 1 + board/varisys/cyrus/cyrus.c | 1 + board/varisys/cyrus/pci.c | 1 + board/ve8313/ve8313.c | 1 + board/vscom/baltos/board.c | 2 + board/wandboard/wandboard.c | 1 + board/warp/warp.c | 1 + board/warp7/warp7.c | 1 + board/work-microwave/work_92105/work_92105.c | 1 + board/xes/common/fsl_8xxx_pci.c | 1 + board/xes/xpedite517x/xpedite517x.c | 1 + board/xes/xpedite520x/xpedite520x.c | 1 + board/xes/xpedite537x/xpedite537x.c | 1 + board/xes/xpedite550x/xpedite550x.c | 1 + .../microblaze-generic/microblaze-generic.c | 1 + board/xilinx/versal/board.c | 2 + board/xilinx/zynq/board.c | 1 + board/xilinx/zynqmp/cmds.c | 1 + board/xilinx/zynqmp/zynqmp.c | 2 + cmd/bdinfo.c | 1 + cmd/booti.c | 1 + cmd/bootz.c | 1 + cmd/cache.c | 1 + cmd/disk.c | 1 + cmd/eeprom.c | 1 + cmd/efi.c | 1 + cmd/elf.c | 1 + cmd/fdc.c | 1 + cmd/i2c.c | 3 +- cmd/irq.c | 1 + cmd/load.c | 2 + cmd/mem.c | 9 +- cmd/mp.c | 1 + cmd/nvedit.c | 1 + cmd/ti/ddr3.c | 1 + cmd/ximg.c | 1 + common/android_ab.c | 1 + common/autoboot.c | 2 + common/avb_verify.c | 1 + common/bloblist.c | 1 + common/board_f.c | 3 + common/board_r.c | 5 + common/bootm.c | 2 + common/bootm_os.c | 1 + common/bootretry.c | 1 + common/bootstage.c | 1 + common/bouncebuf.c | 1 + common/cli.c | 1 + common/cli_readline.c | 7 +- common/cli_simple.c | 1 + common/hash.c | 1 + common/image-fit.c | 1 + common/image.c | 3 + common/iotrace.c | 2 + common/kgdb_stubs.c | 2 + common/lcd.c | 1 + common/lcd_console.c | 1 + common/main.c | 1 + common/spl/spl.c | 14 ++ common/spl/spl_atf.c | 1 + common/spl/spl_opensbi.c | 1 + common/splash_source.c | 1 + common/update.c | 1 + disk/part_efi.c | 1 + drivers/ata/ahci.c | 1 + drivers/ata/dwc_ahsata.c | 1 + drivers/ata/fsl_ahci.c | 1 + drivers/ata/fsl_sata.c | 1 + drivers/ata/sata_mv.c | 1 + drivers/ata/sata_sil.c | 1 + drivers/bootcount/bootcount.c | 1 + drivers/bootcount/bootcount_ram.c | 1 + drivers/clk/clk_stm32mp1.c | 2 + drivers/clk/mpc83xx_clk.c | 1 + drivers/core/device.c | 1 + drivers/cpu/mpc83xx_cpu.c | 1 + drivers/crypto/fsl/fsl_blob.c | 1 + drivers/crypto/fsl/fsl_hash.c | 1 + drivers/crypto/fsl/jobdesc.c | 1 + drivers/crypto/fsl/jr.c | 2 + drivers/ddr/altera/sdram_arria10.c | 1 + drivers/ddr/altera/sdram_s10.c | 1 + drivers/dma/apbh_dma.c | 1 + drivers/dma/bcm6348-iudma.c | 1 + drivers/dma/dma-uclass.c | 1 + drivers/dma/ti/k3-udma.c | 1 + drivers/fastboot/fb_command.c | 1 + drivers/fastboot/fb_common.c | 1 + drivers/firmware/psci.c | 1 + drivers/fpga/versalpl.c | 1 + drivers/fpga/zynqmppl.c | 1 + drivers/fpga/zynqpl.c | 1 + drivers/i2c/fsl_i2c.c | 1 + drivers/mailbox/mailbox-uclass.c | 1 + drivers/misc/atsha204a-i2c.c | 1 + drivers/misc/i2c_eeprom.c | 1 + drivers/misc/pca9551_led.c | 1 + drivers/misc/status_led.c | 8 +- drivers/misc/tegra186_bpmp.c | 1 + drivers/mmc/bcm2835_sdhci.c | 1 + drivers/mmc/dw_mmc.c | 1 + drivers/mmc/fsl_esdhc.c | 1 + drivers/mmc/fsl_esdhc_imx.c | 1 + drivers/mmc/fsl_esdhc_spl.c | 1 + drivers/mmc/meson_gx_mmc.c | 1 + drivers/mmc/mxcmmc.c | 1 + drivers/mmc/omap_hsmmc.c | 1 + drivers/mmc/sdhci.c | 1 + drivers/mmc/stm32_sdmmc2.c | 1 + drivers/mmc/tmio-common.c | 1 + drivers/mtd/cfi_flash.c | 1 + drivers/mtd/mw_eeprom.c | 1 + drivers/mtd/nand/raw/denali.c | 1 + drivers/mtd/nand/raw/fsl_elbc_nand.c | 1 + drivers/mtd/nand/raw/fsl_elbc_spl.c | 1 + drivers/mtd/nand/raw/fsl_ifc_nand.c | 1 + drivers/mtd/nand/raw/fsl_ifc_spl.c | 1 + drivers/mtd/nand/raw/mxs_nand.c | 1 + drivers/mtd/pic32_flash.c | 2 + drivers/mtd/spi/fsl_espi_spl.c | 1 + drivers/mtd/ubi/attach.c | 1 + drivers/mtd/ubi/crc32.c | 1 + drivers/mtd/ubi/eba.c | 1 + drivers/mtd/ubi/fastmap.c | 1 + drivers/mtd/ubi/io.c | 1 + drivers/mtd/ubi/vtbl.c | 1 + drivers/mtd/ubispl/ubispl.c | 1 + drivers/net/ag7xxx.c | 1 + drivers/net/altera_tse.c | 1 + drivers/net/bcm-sf2-eth-gmac.c | 1 + drivers/net/designware.c | 1 + drivers/net/dwc_eth_qos.c | 1 + drivers/net/e1000.c | 1 + drivers/net/ethoc.c | 1 + drivers/net/fec_mxc.c | 1 + drivers/net/fm/fdt.c | 1 + drivers/net/fm/fm.c | 1 + drivers/net/fsl-mc/mc.c | 2 + drivers/net/fsl_mcdmafec.c | 1 + drivers/net/ftgmac100.c | 1 + drivers/net/ftmac100.c | 1 + drivers/net/higmacv300.c | 1 + drivers/net/ldpaa_eth/ldpaa_eth.c | 1 + drivers/net/ldpaa_eth/ls1088a.c | 1 + drivers/net/ldpaa_eth/lx2160a.c | 1 + drivers/net/macb.c | 1 + drivers/net/mcffec.c | 1 + drivers/net/mcfmii.c | 1 + drivers/net/mpc8xx_fec.c | 1 + drivers/net/mt7628-eth.c | 1 + drivers/net/mtk_eth.c | 1 + drivers/net/mvneta.c | 1 + drivers/net/mvpp2.c | 1 + drivers/net/pch_gbe.c | 1 + drivers/net/pcnet.c | 1 + drivers/net/pic32_eth.c | 3 + drivers/net/ravb.c | 1 + drivers/net/rtl8139.c | 1 + drivers/net/rtl8169.c | 1 + drivers/net/sh_eth.c | 1 + drivers/net/sni_ave.c | 1 + drivers/net/sun8i_emac.c | 1 + drivers/net/ti/cpsw.c | 1 + drivers/net/ti/davinci_emac.c | 1 + drivers/net/xilinx_axi_emac.c | 1 + drivers/net/zynq_gem.c | 1 + drivers/nvme/nvme.c | 2 + drivers/pci/pci.c | 1 + drivers/pci/pcie_imx.c | 1 + drivers/power/pmic/stpmic1.c | 1 + drivers/qe/qe.c | 1 + drivers/remoteproc/rproc-elf-loader.c | 1 + drivers/rtc/rv3029.c | 1 + drivers/serial/usbtty.c | 1 + drivers/sound/broadwell_i2s.c | 1 + drivers/spi/ath79_spi.c | 1 + drivers/spi/exynos_spi.c | 1 + drivers/spi/mxs_spi.c | 1 + drivers/spi/rk_spi.c | 1 + drivers/spi/tegra114_spi.c | 1 + drivers/spi/tegra20_sflash.c | 1 + drivers/spi/tegra20_slink.c | 1 + drivers/spi/tegra210_qspi.c | 1 + drivers/spi/ti_qspi.c | 1 + drivers/spi/uniphier_spi.c | 1 + drivers/spi/zynq_spi.c | 1 + drivers/spi/zynqmp_gqspi.c | 1 + drivers/timer/mpc83xx_timer.c | 7 +- drivers/timer/tsc_timer.c | 1 + drivers/tpm/tpm2_tis_sandbox.c | 2 +- drivers/tpm/tpm_tis_sandbox.c | 2 +- drivers/usb/dwc3/core.c | 1 + drivers/usb/dwc3/dwc3-generic.c | 1 + drivers/usb/dwc3/ep0.c | 1 + drivers/usb/dwc3/gadget.c | 1 + drivers/usb/dwc3/io.h | 1 + drivers/usb/gadget/ci_udc.c | 1 + drivers/usb/gadget/core.c | 1 + drivers/usb/gadget/designware_udc.c | 1 + drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c | 3 + drivers/usb/gadget/ep0.c | 3 +- drivers/usb/gadget/f_thor.c | 1 + drivers/usb/gadget/fotg210.c | 1 + drivers/usb/host/dwc2.c | 1 + drivers/usb/host/ehci-hcd.c | 1 + drivers/usb/host/ohci-hcd.c | 1 + drivers/usb/host/xhci-mem.c | 1 + drivers/usb/host/xhci-ring.c | 1 + drivers/usb/host/xhci.c | 1 + drivers/usb/musb-new/omap2430.c | 1 + drivers/usb/musb/musb_udc.c | 1 + drivers/usb/musb/omap3.c | 1 + drivers/video/atmel_hlcdfb.c | 1 + drivers/video/cfb_console.c | 1 + drivers/video/fsl_dcu_fb.c | 1 + drivers/video/sunxi/sunxi_display.c | 3 + drivers/video/sunxi/sunxi_dw_hdmi.c | 1 + drivers/video/video-uclass.c | 1 + env/common.c | 2 + env/eeprom.c | 2 + env/flash.c | 1 + env/nand.c | 1 + env/nvram.c | 1 + env/remote.c | 1 + env/sf.c | 1 + examples/api/glue.c | 1 + fs/jffs2/jffs2_1pass.c | 1 + fs/ubifs/io.c | 1 + fs/ubifs/recovery.c | 1 + fs/ubifs/tnc.c | 1 + fs/yaffs2/yaffs_qsort.c | 1 + include/bootcount.h | 14 +- include/command.h | 16 ++ include/common.h | 212 +----------------- include/cpu_legacy.h | 87 +++++++ include/eeprom_legacy.h | 24 ++ include/exports.h | 4 + include/init.h | 33 ++- include/irq_legacy.h | 24 ++ include/linux/crc8.h | 23 -- include/linux/mii.h | 2 + include/lz4.h | 24 ++ include/net.h | 22 +- include/rand.h | 40 ++++ include/serial.h | 37 ++- include/sort.h | 34 +++ include/status_led.h | 4 +- include/time.h | 42 ++++ include/u-boot/crc.h | 89 +++++++- include/vsprintf.h | 10 + lib/Makefile | 4 +- lib/crc32.c | 5 +- lib/crc8.c | 7 +- lib/efi_loader/efi_boottime.c | 3 + lib/efi_loader/efi_console.c | 1 + lib/efi_loader/efi_image_loader.c | 1 + lib/efi_loader/efi_memory.c | 1 + lib/efi_loader/efi_runtime.c | 2 + lib/efi_loader/efi_variable.c | 1 + lib/efi_selftest/efi_selftest_config_table.c | 1 + lib/efi_selftest/efi_selftest_crc32.c | 1 + lib/gunzip.c | 1 + lib/hashtable.c | 1 + lib/lz4_wrapper.c | 1 + lib/qsort.c | 1 + lib/rand.c | 1 + lib/strmhz.c | 21 -- lib/time.c | 1 + lib/trace.c | 1 + lib/uuid.c | 1 + lib/vsprintf.c | 17 ++ lib/zlib/deflate.c | 1 + net/link_local.c | 1 + net/net.c | 3 - net/nfs.c | 1 + post/cpu/mpc83xx/ecc.c | 3 + post/lib_powerpc/andi.c | 1 + post/lib_powerpc/b.c | 1 + post/lib_powerpc/cmp.c | 1 + post/lib_powerpc/cmpi.c | 1 + post/lib_powerpc/complex.c | 1 + post/lib_powerpc/cpu.c | 7 +- post/lib_powerpc/cr.c | 1 + post/lib_powerpc/load.c | 1 + post/lib_powerpc/multi.c | 1 + post/lib_powerpc/rlwimi.c | 1 + post/lib_powerpc/rlwinm.c | 1 + post/lib_powerpc/rlwnm.c | 1 + post/lib_powerpc/srawi.c | 1 + post/lib_powerpc/store.c | 1 + post/lib_powerpc/string.c | 1 + post/lib_powerpc/three.c | 1 + post/lib_powerpc/threei.c | 1 + post/lib_powerpc/threex.c | 1 + post/lib_powerpc/two.c | 1 + post/lib_powerpc/twox.c | 1 + post/post.c | 1 + scripts/config_whitelist.txt | 1 - test/command_ut.c | 1 + test/compression.c | 1 + test/dm/sf.c | 1 + test/time_ut.c | 1 + tools/default_image.c | 1 + tools/env/fw_env.c | 1 + tools/env/fw_env.h | 2 - tools/envcrc.c | 5 +- tools/mkenvimage.c | 1 + tools/mxsimage.c | 1 + tools/pbl_crc32.c | 1 + tools/pblimage.c | 1 + tools/socfpgaimage.c | 1 + 836 files changed, 1593 insertions(+), 457 deletions(-) create mode 100644 include/cpu_legacy.h create mode 100644 include/eeprom_legacy.h create mode 100644 include/irq_legacy.h delete mode 100644 include/linux/crc8.h create mode 100644 include/lz4.h create mode 100644 include/rand.h create mode 100644 include/sort.h delete mode 100644 lib/strmhz.c
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 1/41 common: Move legacy CPU functions to their own header
These should be moved to driver model, but in the meantime, move them out of the common header to help reduce its size.
---
Changes in v2: None
README | 2 +- arch/arm/cpu/armv8/fsl-layerscape/mp.c | 1 + arch/arm/mach-imx/mx6/mp.c | 1 + arch/arm/mach-zynqmp/mp.c | 1 + arch/powerpc/cpu/mpc85xx/cpu.c | 1 + arch/powerpc/cpu/mpc85xx/mp.c | 1 + arch/powerpc/cpu/mpc86xx/mp.c | 1 + cmd/mp.c | 1 + include/common.h | 8 -------- include/cpu_legacy.h | 23 +++++++++++++++++++++++ 10 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 include/cpu_legacy.h
README +1 -1
@@ -2983,7 +2983,7 @@ Low Level (hardware related) configuration options: - CONFIG_SYS_SRIOn_MEM_VIRT: Virtual Address of SRIO port 'n' memory region -- CONFIG_SYS_SRIOn_MEM_PHYS: +- CONFIG_SYS_SRIOn_MEM_PHYxS: Physical Address of SRIO port 'n' memory region - CONFIG_SYS_SRIOn_MEM_SIZE:
arch/arm/cpu/armv8/fsl-layerscape/mp.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/system.h> #include <asm/arch/mp.h>
arch/arm/mach-imx/mx6/mp.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <linux/errno.h> #include <asm/arch/sys_proto.h>
arch/arm/mach-zynqmp/mp.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/arch/hardware.h> #include <asm/arch/sys_proto.h> #include <asm/io.h>
arch/powerpc/cpu/mpc85xx/cpu.c +1 -0
@@ -10,6 +10,7 @@#include <config.h> #include <common.h> +#include <cpu_legacy.h> #include <watchdog.h> #include <command.h> #include <fsl_esdhc.h>
arch/powerpc/cpu/mpc85xx/mp.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <env.h> #include <asm/processor.h> #include <env.h>
arch/powerpc/cpu/mpc86xx/mp.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/processor.h> #include <asm/mmu.h> #include <ioports.h>
cmd/mp.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <command.h> +#include <cpu_legacy.h> static int cpu_status_all (void ) {
include/common.h +0 -8
@@ -355,14 +355,6 @@ static inline struct in_addr env_get_ip(char *var)void show_activity (int arg);#endif -/* Multicore arch functions */ -#ifdef CONFIG_MP -int cpu_status (u32 nr); -int cpu_reset (u32 nr); -int cpu_disable (u32 nr); -int cpu_release (u32 nr,int argc,char *const argv[]); -#endif -#else /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
include/cpu_legacy.h new file +23 -0
@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* (C) Copyright 2000-2009 +* Wolfgang Denk, DENX Software Engineering, wd at denx.de. +* Copyright 2019 Google LLC +*/ + +#ifndef __CPU_LEGACY_H +#define __CPU_LEGACY_H + +#include <linux/types.h> + +/* +* Multicore arch functions +* +* These should be moved to use the CPU uclass. +*/ +int cpu_status (u32 nr); +int cpu_reset (u32 nr); +int cpu_disable (u32 nr); +int cpu_release (u32 nr,int argc,char *const argv[]); + +#endif
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 2/41 Drop CONFIG_SHOW_ACTIVITY
In reply to Simon GlassThis feature is not enabled by any board. Drop it.
---
Changes in v2: None
arch/powerpc/lib/interrupts.c | 13 ------------- common/cli_readline.c | 6 ------ drivers/timer/mpc83xx_timer.c | 4 ---- include/common.h | 4 ---- net/net.c | 3 --- scripts/config_whitelist.txt | 1 - 6 files changed, 31 deletions(-)
arch/powerpc/lib/interrupts.c +0 -13
@@ -15,15 +15,6 @@#endif #ifndef CONFIG_MPC83XX_TIMER -#ifdef CONFIG_SHOW_ACTIVITY -void board_show_activity (ulong ) __attribute__((weak,alias ("__board_show_activity" ))); - -void __board_show_activity (ulong dummy) -{ -return ; -} -#endif /* CONFIG_SHOW_ACTIVITY */ -#ifndef CONFIG_SYS_WATCHDOG_FREQ #define CONFIG_SYS_WATCHDOG_FREQ (CONFIG_SYS_HZ / 2)#endif
@@ -94,10 +85,6 @@ void timer_interrupt (struct pt_regs *regs)#ifdef CONFIG_LED_STATUS status_led_tick (timestamp);#endif /* CONFIG_LED_STATUS */ - -#ifdef CONFIG_SHOW_ACTIVITY -board_show_activity (timestamp); -#endif /* CONFIG_SHOW_ACTIVITY */ }ulong get_timer (ulong base)
common/cli_readline.c +0 -6
@@ -569,12 +569,6 @@ int cli_readline_into_buffer(const char *const prompt, char *buffer,return -2 ;/* timed out */ WATCHDOG_RESET ();/* Trigger watchdog, if needed */ -#ifdef CONFIG_SHOW_ACTIVITY -while (!tstc ()) { -show_activity (0 ); -WATCHDOG_RESET (); - } -#endif c =getc ();/*
drivers/timer/mpc83xx_timer.c +0 -4
@@ -171,10 +171,6 @@ void timer_interrupt(struct pt_regs *regs)#ifdef CONFIG_LED_STATUS status_led_tick (priv->timestamp);#endif /* CONFIG_LED_STATUS */ - -#ifdef CONFIG_SHOW_ACTIVITY -board_show_activity (priv->timestamp); -#endif /* CONFIG_SHOW_ACTIVITY */ }void wait_ticks (ulong ticks)
include/common.h +0 -4
@@ -351,10 +351,6 @@ static inline struct in_addr env_get_ip(char *var)#include <bootstage.h> -#ifdef CONFIG_SHOW_ACTIVITY -void show_activity (int arg); -#endif -#else /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
net/net.c +0 -3
@@ -561,9 +561,6 @@ restart:*/ for (;;) {WATCHDOG_RESET (); -#ifdef CONFIG_SHOW_ACTIVITY -show_activity (1 ); -#endif if (arp_timeout_check () >0 ) time_start =get_timer (0 );
scripts/config_whitelist.txt +0 -1
@@ -1574,7 +1574,6 @@ CONFIG_SHARP_LM8V31 CONFIG_SHARP_LQ035Q7DH06 CONFIG_SHEEVA_88SV131 CONFIG_SHEEVA_88SV331xV5 -CONFIG_SHOW_ACTIVITY CONFIG_SH_CMT_CLK_FREQ CONFIG_SH_DSP CONFIG_SH_ETHER_ALIGNE_SIZE
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 3/41 common: Drop global inclusion of status_led.h
In reply to Simon GlassThis is only used by a few files so it should not be in the common header. Move it out.
---
Changes in v2: None
board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c | 1 + board/atmel/at91sam9261ek/led.c | 1 + board/atmel/at91sam9263ek/led.c | 1 + board/atmel/at91sam9m10g45ek/led.c | 1 + board/atmel/at91sam9rlek/led.c | 1 + board/cirrus/edb93xx/edb93xx.c | 1 + board/compulab/cm_t335/cm_t335.c | 1 + board/corscience/tricorder/tricorder.c | 1 + board/mini-box/picosam9g45/led.c | 1 + board/ronetix/pm9261/led.c | 1 + board/ronetix/pm9263/led.c | 1 + board/softing/vining_fpga/socfpga.c | 1 + board/st/stm32f429-discovery/led.c | 1 + common/board_r.c | 1 + drivers/misc/pca9551_led.c | 1 + drivers/timer/mpc83xx_timer.c | 1 + include/common.h | 4 ---- 17 files changed, 16 insertions(+), 4 deletions(-)
board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c +1 -0
@@ -8,6 +8,7 @@#include <linux/io.h> #include <miiphy.h> #include <netdev.h> +#include <status_led.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h> #include <asm/arch/mpp.h>
board/atmel/at91sam9261ek/led.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <status_led.h> #include <asm/arch/at91sam9261.h> #include <asm/arch/gpio.h> #include <asm/arch/at91_pio.h>
board/atmel/at91sam9263ek/led.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <status_led.h> #include <asm/io.h> #include <asm/arch/gpio.h> #include <asm/arch/at91sam9263.h>
board/atmel/at91sam9m10g45ek/led.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <status_led.h> #include <asm/io.h> #include <asm/arch/at91sam9g45.h> #include <asm/arch/clk.h>
board/atmel/at91sam9rlek/led.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <status_led.h> #include <asm/arch/at91sam9rl.h> #include <asm/arch/clk.h> #include <asm/arch/gpio.h>
board/cirrus/edb93xx/edb93xx.c +1 -0
@@ -16,6 +16,7 @@#include <config.h> #include <common.h> #include <netdev.h> +#include <status_led.h> #include <asm/io.h> #include <asm/mach-types.h> #include <asm/arch/ep93xx.h>
board/compulab/cm_t335/cm_t335.c +1 -0
@@ -11,6 +11,7 @@#include <env.h> #include <errno.h> #include <miiphy.h> +#include <status_led.h> #include <cpsw.h> #include <asm/arch/sys_proto.h>
board/corscience/tricorder/tricorder.c +1 -0
@@ -11,6 +11,7 @@*/ #include <common.h> #include <twl4030.h> +#include <status_led.h> #include <asm/io.h> #include <asm/gpio.h> #include <asm/arch/mmc_host_def.h>
board/mini-box/picosam9g45/led.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <status_led.h> #include <asm/io.h> #include <asm/arch/at91sam9g45.h> #include <asm/arch/clk.h>
board/ronetix/pm9261/led.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <status_led.h> #include <asm/gpio.h> #include <asm/arch/clk.h> #include <asm/arch/gpio.h>
board/ronetix/pm9263/led.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <status_led.h> #include <asm/gpio.h> #include <asm/arch/clk.h> #include <asm/arch/gpio.h>
board/softing/vining_fpga/socfpga.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <env.h> +#include <status_led.h> #include <asm/arch/reset_manager.h> #include <asm/io.h> #include <asm/gpio.h>
board/st/stm32f429-discovery/led.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <status_led.h> #include <asm-generic/gpio.h> void coloured_LED_init (void )
common/board_r.c +1 -0
@@ -37,6 +37,7 @@#include <onenand_uboot.h> #include <scsi.h> #include <serial.h> +#include <status_led.h> #include <stdio_dev.h> #include <timer.h> #include <trace.h>
drivers/misc/pca9551_led.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <errno.h> #include <i2c.h> +#include <status_led.h> #ifndef CONFIG_PCA9551_I2C_ADDR #error "CONFIG_PCA9551_I2C_ADDR not defined!"
drivers/timer/mpc83xx_timer.c +1 -0
@@ -8,6 +8,7 @@#include <board.h> #include <clk.h> #include <dm.h> +#include <status_led.h> #include <timer.h> #include <watchdog.h>
include/common.h +0 -4
@@ -345,10 +345,6 @@ static inline struct in_addr env_get_ip(char *var) return string_to_ip(env_get(var)); } -#ifdef CONFIG_LED_STATUS -# include <status_led.h> -#endif -#include <bootstage.h> #else /* __ASSEMBLY__ */
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 3/41 common: Drop global inclusion of status_led.h
Quoted 4 lines · Simon Glass
This is only used by a few files so it should not be in the common header. Move it out.
Signed-off-by Simon Glass <[email protected]>
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/4c931e86/attachment.sig>
PATCH v2 4/41 status_led: Tidy up the code style
In reply to Simon GlassThere are a few whitespace problems with this code. Tidy them up.
---
Changes in v2: None
arch/powerpc/lib/interrupts.c | 2 +- drivers/misc/status_led.c | 8 ++++---- include/status_led.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-)
arch/powerpc/lib/interrupts.c +1 -1
@@ -83,7 +83,7 @@ void timer_interrupt (struct pt_regs *regs)#endif /* CONFIG_WATCHDOG || CONFIG_HW_WATCHDOG */ #ifdef CONFIG_LED_STATUS -status_led_tick (timestamp); +status_led_tick (timestamp);#endif /* CONFIG_LED_STATUS */ }
drivers/misc/status_led.c +4 -4
@@ -82,13 +82,13 @@ void status_led_init(void) status_led_init_done =1 ; } -void status_led_tick (ulong timestamp) +void status_led_tick (ulong timestamp) {led_dev_t *ld;int i;if (!status_led_init_done) -status_led_init (); +status_led_init ();for (i =0 , ld = led_dev; i <MAX_LED_DEV ; i++, ld++) {
@@ -103,7 +103,7 @@ void status_led_tick (ulong timestamp) } } -void status_led_set (int led,int state) +void status_led_set (int led,int state) {led_dev_t *ld;
@@ -111,7 +111,7 @@ void status_led_set (int led, int state)return ;if (!status_led_init_done) -status_led_init (); +status_led_init (); ld = &led_dev[led];
include/status_led.h +2 -2
@@ -36,8 +36,8 @@#endif /* CONFIG_LED_STATUS5 */ void status_led_init (void ); -void status_led_tick (unsigned long timestamp); -void status_led_set (int led,int state); +void status_led_tick (unsigned long timestamp); +void status_led_set (int led,int state);/***** MVS v1 **********************************************************/ #if (defined(CONFIG_MVS ) &&CONFIG_MVS <2 )
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 4/41 status_led: Tidy up the code style
Quoted 3 lines · Simon Glass
There are a few whitespace problems with this code. Tidy them up.
Signed-off-by Simon Glass <[email protected]>
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/ec757745/attachment.sig>
PATCH v2 5/41 common: Move random-number functions into their own header
In reply to Simon GlassCreate a new rand.h header file and move functions into it, to reduce the size of common.h
---
Changes in v2: None
include/common.h | 6 ------ include/net.h | 1 + include/rand.h | 40 ++++++++++++++++++++++++++++++++++++++++ lib/rand.c | 1 + net/link_local.c | 1 + 5 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 include/rand.h
include/common.h +0 -6
@@ -325,12 +325,6 @@ char * strmhz(char *buf, unsigned long hz);/* lib/crc32.c */ #include <u-boot/crc.h> -/* lib/rand.c */ -#define RAND_MAX -1U -void srand (unsigned int seed); -unsigned int rand (void ); -unsigned int rand_r (unsigned int *seedp); -/* * STDIO based functions (can always be used) */
include/net.h +1 -0
@@ -16,6 +16,7 @@#include <asm/byteorder.h> /* for nton* / ntoh* stuff */ #include <env.h> #include <linux/if_ether.h> +#include <rand.h> #define DEBUG_LL_STATE 0/* Link local state machine changes */ #define DEBUG_DEV_PKT 0/* Packets or info directed to the device */
include/rand.h new file +40 -0
@@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* (C) Copyright 2000-2009 +* Wolfgang Denk, DENX Software Engineering, wd at denx.de. +*/ + +#ifndef __RAND_H +#define __RAND_H + +#define RAND_MAX -1U + +/** +* srand() - Set the random-number seed value +* +* This can be used to restart the pseudo-random-number sequence from a known +* point. This affects future calls to rand() to start from that point +* +* @seed: New seed +*/ +void srand (unsigned int seed); + +/** +* rand() - Get a 32-bit pseudo-random number +* +* @returns next random number in the sequence +*/ +unsigned int rand (void ); + +/** +* rand_r() - Get a 32-bit pseudo-random number +* +* This version of the function allows multiple sequences to be used at the +* same time, since it requires the caller to store the seed value. +* +* @seed value to use, updated on exit +* @returns next random number in the sequence +*/ +unsigned int rand_r (unsigned int *seedp); + +#endif
lib/rand.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <rand.h> static unsigned int y =1U ;
net/link_local.c +1 -0
@@ -14,6 +14,7 @@#include <common.h> #include <env.h> #include <net.h> +#include <rand.h> #include "arp.h" #include "net_rand.h"
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 5/41 common: Move random-number functions into their own header
Quoted 38 lines · Simon Glass
Create a new
rand.hheader file and move functions into it, to reduce the size ofcommon.hSigned-off-by Simon Glass <[email protected]>---
Changes in v2: None
include/common.h | 6 ------ include/net.h | 1 + include/rand.h | 40 ++++++++++++++++++++++++++++++++++++++++ lib/rand.c | 1 + net/link_local.c | 1 + 5 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 include/rand.hinclude/common.h +0
-6@@ -325,12 +325,6 @@ char * strmhz(char *buf, unsigned long hz);/* lib/crc32.c */ #include <u-boot/crc.h> -/* lib/rand.c */ -#define RAND_MAX -1U -void srand (unsigned int seed); -unsigned int rand (void ); -unsigned int rand_r (unsigned int *seedp); -/* * STDIO based functions (can always be used) */ include/net.h +0
-0
include/net.h line 22
Quoted 7 lines
include/net.h +1
-0@@ -16,6 +16,7 @@#include <asm/byteorder.h> /* for nton* / ntoh* stuff */ #include <env.h> #include <linux/if_ether.h> +#include <rand.h> #define DEBUG_LL_STATE 0/* Link local state machine changes */ #define DEBUG_DEV_PKT 0/* Packets or info directed to the device */
OK, but common.h includes net.h, and I don't see this addressed further in the series. So this is a step in the right direction, but does it get messy to not include it?
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/5bbfb20e/attachment.sig>
PATCH v2 5/41 common: Move random-number functions into their own header
Hi Tom,
Quoted 45 lines · Tom Rini
Quoted 43 lines · Simon Glass
Create a new
rand.hheader file and move functions into it, to reduce the size ofcommon.hSigned-off-by Simon Glass <[email protected]>---
Changes in v2: None
include/common.h | 6 ------ include/net.h | 1 + include/rand.h | 40 ++++++++++++++++++++++++++++++++++++++++ lib/rand.c | 1 + net/link_local.c | 1 + 5 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 include/rand.hinclude/common.h +0
-6@@ -325,12 +325,6 @@ char * strmhz(char *buf, unsigned long hz);/* lib/crc32.c */ #include <u-boot/crc.h> -/* lib/rand.c */ -#define RAND_MAX -1U -void srand (unsigned int seed); -unsigned int rand (void ); -unsigned int rand_r (unsigned int *seedp); -/* * STDIO based functions (can always be used) */ include/net.h +1
-0@@ -16,6 +16,7 @@#include <asm/byteorder.h> /* for nton* / ntoh* stuff */ #include <env.h> #include <linux/if_ether.h> +#include <rand.h>
Quoted 6 lines
include/net.h line 22
Quoted 2 lines
include/net.h +0
-0#define DEBUG_LL_STATE 0/* Link local state machine changes */ #define DEBUG_DEV_PKT 0/* Packets or info directed to the device */ OK, but
common.hincludesnet.h, and I don't see this addressed further in the series. So this is a step in the right direction, but does it get messy to not include it?
Even after this series there are about another 40 functions to remove from common.h - once that is done I can look at dropping the includes.
I suspect it should be possible to remove net.h provided that it only includes network functions.
Regards,
Simon
PATCH v2 5/41 common: Move random-number functions into their own header
Quoted 55 lines · Simon Glass
Hi Tom,
Quoted 45 lines · Tom Rini
Quoted 43 lines · Simon Glass
Create a new
rand.hheader file and move functions into it, to reduce the size ofcommon.hSigned-off-by Simon Glass <[email protected]>---
Changes in v2: None
include/common.h | 6 ------ include/net.h | 1 + include/rand.h | 40 ++++++++++++++++++++++++++++++++++++++++ lib/rand.c | 1 + net/link_local.c | 1 + 5 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 include/rand.hinclude/common.h +0
-6@@ -325,12 +325,6 @@ char * strmhz(char *buf, unsigned long hz);/* lib/crc32.c */ #include <u-boot/crc.h> -/* lib/rand.c */ -#define RAND_MAX -1U -void srand (unsigned int seed); -unsigned int rand (void ); -unsigned int rand_r (unsigned int *seedp); -/* * STDIO based functions (can always be used) */ include/net.h +1
-0@@ -16,6 +16,7 @@#include <asm/byteorder.h> /* for nton* / ntoh* stuff */ #include <env.h> #include <linux/if_ether.h> +#include <rand.h> Quoted 6 lines
include/net.h line 22
Quoted 2 lines
include/net.h +0
-0#define DEBUG_LL_STATE 0/* Link local state machine changes */ #define DEBUG_DEV_PKT 0/* Packets or info directed to the device */ OK, but
common.hincludesnet.h, and I don't see this addressed further in the series. So this is a step in the right direction, but does it get messy to not include it?
Quoted 5 lines
Even after this series there are about another 40 functions to remove from
common.h- once that is done I can look at dropping the includes.I suspect it should be possible to remove
net.hprovided that it only includes network functions.
OK, so just laying ground work for future cleanups, I can accept that, 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: <http://lists.denx.de/pipermail/u-boot/attachments/20191112/f72ccada/attachment.sig>
PATCH v2 6/41 common: Drop linux/crc8.h
In reply to Simon GlassWe have an existing U-Boot header for the one function that this defines. Use that instead of the linux/ one. Move over the nice comment.
---
Changes in v2: None
board/theadorable/theadorable.c | 2 +- drivers/tpm/tpm2_tis_sandbox.c | 2 +- drivers/tpm/tpm_tis_sandbox.c | 2 +- include/linux/crc8.h | 23 ----------------------- include/u-boot/crc.h | 14 +++++++++++++- lib/crc8.c | 7 ++++++- 6 files changed, 22 insertions(+), 28 deletions(-) delete mode 100644 include/linux/crc8.h
board/theadorable/theadorable.c +1 -1
@@ -14,11 +14,11 @@#include <asm/io.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h> -#include <linux/crc8.h> #include <linux/mbus.h> #ifdef CONFIG_NET #include <netdev.h> #endif +#include <u-boot/crc.h> #include "theadorable.h" #include "../drivers/ddr/marvell/axp/ddr3_hw_training.h"
drivers/tpm/tpm2_tis_sandbox.c +1 -1
@@ -9,7 +9,7 @@#include <tpm-v2.h> #include <asm/state.h> #include <asm/unaligned.h> -#include <linux/crc8.h> +#include <u-boot/crc.h> /* Hierarchies */ enum tpm2_hierarchy {
drivers/tpm/tpm_tis_sandbox.c +1 -1
@@ -8,7 +8,7 @@#include <tpm-v1.h> #include <asm/state.h> #include <asm/unaligned.h> -#include <linux/crc8.h> +#include <u-boot/crc.h> /* TPM NVRAM location indices. */ #define FIRMWARE_NV_INDEX 0x1007
include/linux/crc8.h deleted +0 -23
@@ -1,23 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright (c) 2013 Google, Inc -*/ - - -#ifndef __linux_crc8_h -#define __linux_crc8_h - -/** -* crc8() - Calculate and return CRC-8 of the data -* -* This uses an x^8 + x^2 + x + 1 polynomial. A table-based algorithm would -* be faster, but for only a few bytes it isn't worth the code size -* -* @crc_start: CRC8 start value -* @vptr: Buffer to checksum -* @len: Length of buffer in bytes -* @return CRC8 checksum -*/ -unsigned int crc8 (unsigned int crc_start,const unsigned char *vptr,int len); - -#endif
include/u-boot/crc.h +13 -1
@@ -8,7 +8,19 @@#ifndef _UBOOT_CRC_H#define _UBOOT_CRC_H -/* lib/crc8.c */ +/** +* crc8() - Calculate and return CRC-8 of the data +* +* This uses an x^8 + x^2 + x + 1 polynomial. A table-based algorithm would +* be faster, but for only a few bytes it isn't worth the code size +* +* lib/crc8.c +* +* @crc_start: CRC8 start value +* @vptr: Buffer to checksum +* @len: Length of buffer in bytes +* @return CRC8 checksum +*/ unsigned int crc8 (unsigned int crc_start,const unsigned char *vptr,int len);/* lib/crc16.c - 16 bit CRC with polynomial x^16+x^12+x^5+1 (CRC-CCITT) */
lib/crc8.c +6 -1
@@ -3,7 +3,12 @@* Copyright (c) 2013 Google, Inc */ -#include "linux/crc8.h" +#ifdef USE_HOSTCC +#include <arpa/inet.h> +#else +#include <common.h> +#endif +#include <u-boot/crc.h> #define POLY (0x1070U << 3)
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 6/41 common: Drop linux/crc8.h
Quoted 4 lines · Simon Glass
We have an existing U-Boot header for the one function that this defines. Use that instead of the linux/ one. Move over the nice comment.
Signed-off-by Simon Glass <[email protected]>
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/aea5ede2/attachment.sig>
PATCH v2 7/41 crc: Fix code style with crc functions
In reply to Simon GlassSome of these have a space before the bracket. Drop it to fix the style. Add some missing function comments while here.
Note that u32 and u8 cannot be used here since crc.h is included on the host side.
---
Changes in v2: None
cmd/i2c.c | 2 +- include/u-boot/crc.h | 75 +++++++++++++++++++++++++++++++++++++++----- lib/crc32.c | 4 +-- tools/envcrc.c | 4 +-- 4 files changed, 73 insertions(+), 12 deletions(-)
cmd/i2c.c +1 -1
@@ -768,7 +768,7 @@ static int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]#endif if (ret) err++; - crc =crc32 (crc, &byte,1 ); + crc =crc32 (crc, &byte,1 ); addr++; }if (err >0 )
include/u-boot/crc.h +68 -7
88 lines not on this page · raw message
lib/crc32.c +2 -2
@@ -244,12 +244,12 @@ uint32_t crc32_wd(uint32_t crc, const unsigned char *buf, uInt len, chunk = end - curr;if (chunk > chunk_sz) chunk = chunk_sz; - crc =crc32 (crc, curr, chunk); + crc =crc32 (crc, curr, chunk); curr += chunk; WATCHDOG_RESET (); }#else - crc =crc32 (crc, buf, len); + crc =crc32 (crc, buf, len);#endif return crc;
tools/envcrc.c +2 -2
@@ -64,7 +64,7 @@ extern unsigned int env_size;extern env_t embedded_environment;#endif /* CONFIG_BUILD_ENVCRC */ -extern uint32_t crc32 (uint32_t ,const unsigned char *,unsigned int ); +extern uint32_t crc32 (uint32_t ,const unsigned char *,unsigned int );int main (int argc,char **argv) {
@@ -94,7 +94,7 @@ int main (int argc, char **argv)memset (dataptr + eoe, pad, datasize - eoe); } - crc =crc32 (0 , dataptr, datasize); + crc =crc32 (0 , dataptr, datasize);/* Check if verbose mode is activated passing a parameter to the program */ if (argc >1 ) {
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 7/41 crc: Fix code style with crc functions
Quoted 7 lines · Simon Glass
Some of these have a space before the bracket. Drop it to fix the style. Add some missing function comments while here.
Note that u32 and u8 cannot be used here since
crc.his included on the host side.Signed-off-by Simon Glass <[email protected]>
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/0557c99b/attachment.sig>
PATCH v2 8/41 crc32: Use the crc.h header for crc functions
In reply to Simon GlassDrop inclusion of crc.h in common.h and use the correct header directly instead.
With this we can drop the conflicting definition in fw_env.h and rely on the crc.h header, which is already included.
---
Changes in v2: None
api/api.c | 1 + arch/arm/mach-meson/board-common.c | 1 + arch/arm/mach-rockchip/misc.c | 1 + board/CZ.NIC/turris_omnia/turris_omnia.c | 1 + board/corscience/tricorder/tricorder-eeprom.c | 1 + board/freescale/common/sys_eeprom.c | 1 + board/freescale/mpc8323erdb/mpc8323erdb.c | 1 + board/gardena/smart-gateway-mt7688/board.c | 1 + board/gdsys/a38x/hre.c | 1 + board/gdsys/p1022/controlcenterd-id.c | 1 + board/sunxi/board.c | 1 + board/theobroma-systems/puma_rk3399/puma-rk3399.c | 1 + board/varisys/common/sys_eeprom.c | 1 + cmd/i2c.c | 1 + cmd/nvedit.c | 1 + common/android_ab.c | 1 + common/bloblist.c | 1 + common/board_r.c | 1 + common/hash.c | 1 + common/image-fit.c | 1 + common/image.c | 1 + common/iotrace.c | 1 + common/spl/spl.c | 1 + disk/part_efi.c | 1 + drivers/misc/atsha204a-i2c.c | 1 + drivers/mtd/ubi/attach.c | 1 + drivers/mtd/ubi/crc32.c | 1 + drivers/mtd/ubi/eba.c | 1 + drivers/mtd/ubi/fastmap.c | 1 + drivers/mtd/ubi/io.c | 1 + drivers/mtd/ubi/vtbl.c | 1 + drivers/mtd/ubispl/ubispl.c | 1 + drivers/net/fm/fdt.c | 1 + drivers/net/fm/fm.c | 1 + drivers/qe/qe.c | 1 + env/common.c | 1 + env/eeprom.c | 1 + env/flash.c | 1 + env/nand.c | 1 + env/nvram.c | 1 + env/remote.c | 1 + env/sf.c | 1 + examples/api/glue.c | 1 + fs/jffs2/jffs2_1pass.c | 1 + fs/ubifs/io.c | 1 + fs/ubifs/recovery.c | 1 + fs/ubifs/tnc.c | 1 + include/common.h | 3 --- lib/crc32.c | 1 + lib/efi_loader/efi_boottime.c | 1 + lib/efi_loader/efi_runtime.c | 1 + lib/efi_loader/efi_variable.c | 1 + lib/efi_selftest/efi_selftest_config_table.c | 1 + lib/efi_selftest/efi_selftest_crc32.c | 1 + lib/gunzip.c | 1 + lib/zlib/deflate.c | 1 + tools/default_image.c | 1 + tools/env/fw_env.c | 1 + tools/env/fw_env.h | 2 -- tools/envcrc.c | 1 + tools/mkenvimage.c | 1 + tools/mxsimage.c | 1 + tools/pbl_crc32.c | 1 + tools/pblimage.c | 1 + tools/socfpgaimage.c | 1 + 65 files changed, 63 insertions(+), 5 deletions(-)
api/api.c +1 -0
@@ -13,6 +13,7 @@#include <env_internal.h> #include <linux/types.h> #include <api_public.h> +#include <u-boot/crc.h> #include "api_private.h"
arch/arm/mach-meson/board-common.c +1 -0
@@ -13,6 +13,7 @@#include <asm/armv8/mmu.h> #include <asm/unaligned.h> #include <efi_loader.h> +#include <u-boot/crc.h> #if CONFIG_IS_ENABLED (FASTBOOT )#include <asm/psci.h>
arch/arm/mach-rockchip/misc.c +1 -0
@@ -14,6 +14,7 @@#include <dm.h> #include <dm/uclass-internal.h> #include <misc.h> +#include <u-boot/crc.h> #include <u-boot/sha256.h> #include <asm/arch-rockchip/misc.h>
board/CZ.NIC/turris_omnia/turris_omnia.c +1 -0
@@ -18,6 +18,7 @@#include <dm/uclass.h> #include <fdt_support.h> #include <time.h> +#include <u-boot/crc.h> # include <atsha204a-i2c.h> #include "../drivers/ddr/marvell/a38x/ddr3_init.h"
board/corscience/tricorder/tricorder-eeprom.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> #include <i2c.h> +#include <u-boot/crc.h> #include "tricorder-eeprom.h"
board/freescale/common/sys_eeprom.c +1 -0
@@ -11,6 +11,7 @@#include <env.h> #include <i2c.h> #include <linux/ctype.h> +#include <u-boot/crc.h> #ifdef CONFIG_SYS_I2C_EEPROM_CCID #include "../common/eeprom.h"
board/freescale/mpc8323erdb/mpc8323erdb.c +1 -0
@@ -17,6 +17,7 @@#include <miiphy.h> #include <command.h> #include <linux/libfdt.h> +#include <u-boot/crc.h> #if defined(CONFIG_PCI )#include <pci.h> #endif
board/gardena/smart-gateway-mt7688/board.c +1 -0
@@ -10,6 +10,7 @@#include <net.h> #include <spi.h> #include <spi_flash.h> +#include <u-boot/crc.h> #include <uuid.h> #include <linux/ctype.h> #include <linux/io.h>
board/gdsys/a38x/hre.c +1 -0
@@ -10,6 +10,7 @@#include <i2c.h> #include <mmc.h> #include <tpm-v1.h> +#include <u-boot/crc.h> #include <u-boot/sha1.h> #include <asm/byteorder.h> #include <asm/unaligned.h>
board/gdsys/p1022/controlcenterd-id.c +1 -0
@@ -18,6 +18,7 @@#include <i2c.h> #include <mmc.h> #include <tpm-v1.h> +#include <u-boot/crc.h> #include <u-boot/sha1.h> #include <asm/byteorder.h> #include <asm/unaligned.h>
board/sunxi/board.c +1 -0
@@ -24,6 +24,7 @@#include <asm/arch/gpio.h> #include <asm/arch/mmc.h> #include <asm/arch/spl.h> +#include <u-boot/crc.h> #ifndef CONFIG_ARM64 #include <asm/armv7.h> #endif
board/theobroma-systems/puma_rk3399/puma-rk3399.c +1 -0
@@ -9,6 +9,7 @@#include <misc.h> #include <spl.h> #include <syscon.h> +#include <u-boot/crc.h> #include <usb.h> #include <dm/pinctrl.h> #include <dm/uclass-internal.h>
board/varisys/common/sys_eeprom.c +1 -0
@@ -15,6 +15,7 @@#include <env.h> #include <i2c.h> #include <linux/ctype.h> +#include <u-boot/crc.h> #include "eeprom.h"
cmd/i2c.c +1 -0
@@ -76,6 +76,7 @@#include <malloc.h> #include <asm/byteorder.h> #include <linux/compiler.h> +#include <u-boot/crc.h> /* Display values from last command. * Memory modify remembered values are different from display memory.
cmd/nvedit.c +1 -0
@@ -33,6 +33,7 @@#include <errno.h> #include <malloc.h> #include <mapmem.h> +#include <u-boot/crc.h> #include <watchdog.h> #include <linux/stddef.h> #include <asm/byteorder.h>
common/android_ab.c +1 -0
@@ -8,6 +8,7 @@#include <linux/err.h> #include <memalign.h> #include <u-boot/crc.h> +#include <u-boot/crc.h> /** * Compute the CRC-32 of the bootloader control struct.
common/bloblist.c +1 -0
@@ -9,6 +9,7 @@#include <log.h> #include <mapmem.h> #include <spl.h> +#include <u-boot/crc.h> DECLARE_GLOBAL_DATA_PTR ;
common/board_r.c +1 -0
@@ -11,6 +11,7 @@#include <common.h> #include <api.h> +#include <u-boot/crc.h> /* TODO: can we just include all these headers whether needed or not? */ #if defined(CONFIG_CMD_BEDBUG )#include <bedbug/type.h>
common/hash.c +1 -0
@@ -18,6 +18,7 @@#include <hw_sha.h> #include <asm/io.h> #include <linux/errno.h> +#include <u-boot/crc.h> #else #include "mkimage.h" #include <time.h>
common/image-fit.c +1 -0
@@ -11,6 +11,7 @@#ifdef USE_HOSTCC #include "mkimage.h" #include <time.h> +#include <u-boot/crc.h> #else #include <linux/compiler.h> #include <linux/kconfig.h>
common/image.c +1 -0
@@ -9,6 +9,7 @@#ifndef USE_HOSTCC #include <common.h> #include <env.h> +#include <u-boot/crc.h> #include <watchdog.h> #ifdef CONFIG_SHOW_BOOT_PROGRESS
common/iotrace.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <mapmem.h> #include <asm/io.h> +#include <u-boot/crc.h> DECLARE_GLOBAL_DATA_PTR ;
common/spl/spl.c +1 -0
@@ -15,6 +15,7 @@#include <asm/u-boot.h> #include <nand.h> #include <fat.h> +#include <u-boot/crc.h> #include <version.h> #include <image.h> #include <malloc.h>
disk/part_efi.c +1 -0
@@ -19,6 +19,7 @@#include <part_efi.h> #include <linux/compiler.h> #include <linux/ctype.h> +#include <u-boot/crc.h> DECLARE_GLOBAL_DATA_PTR ;
drivers/misc/atsha204a-i2c.c +1 -0
@@ -15,6 +15,7 @@#include <i2c.h> #include <errno.h> #include <atsha204a-i2c.h> +#include <u-boot/crc.h> #define ATSHA204A_TWLO 60#define ATSHA204A_TRANSACTION_TIMEOUT 100000
drivers/mtd/ubi/attach.c +1 -0
@@ -74,6 +74,7 @@#include <linux/slab.h> #include <linux/crc32.h> #include <linux/random.h> +#include <u-boot/crc.h> #else #include <div64.h> #include <linux/err.h>
drivers/mtd/ubi/crc32.c +1 -0
@@ -25,6 +25,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/compiler.h> +#include <u-boot/crc.h> #endif #include <linux/types.h>
drivers/mtd/ubi/eba.c +1 -0
@@ -31,6 +31,7 @@#ifndef __UBOOT__#include <linux/slab.h> #include <linux/crc32.h> +#include <u-boot/crc.h> #else #include <ubi_uboot.h> #endif
drivers/mtd/ubi/fastmap.c +1 -0
@@ -8,6 +8,7 @@#ifndef __UBOOT__#include <linux/crc32.h> +#include <u-boot/crc.h> #else #include <div64.h> #include <malloc.h>
drivers/mtd/ubi/io.c +1 -0
@@ -77,6 +77,7 @@#include <linux/crc32.h> #include <linux/err.h> #include <linux/slab.h> +#include <u-boot/crc.h> #else #include <hexdump.h> #include <ubi_uboot.h>
drivers/mtd/ubi/vtbl.c +1 -0
@@ -50,6 +50,7 @@#include <linux/err.h> #include <linux/slab.h> #include <asm/div64.h> +#include <u-boot/crc.h> #else #include <ubi_uboot.h> #endif
drivers/mtd/ubispl/ubispl.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <errno.h> +#include <u-boot/crc.h> #include <ubispl.h> #include <linux/crc32.h>
drivers/net/fm/fdt.c +1 -0
@@ -5,6 +5,7 @@#include <asm/io.h> #include <env.h> #include <fsl_qe.h> /* For struct qe_firmware */ +#include <u-boot/crc.h> #ifdef CONFIG_SYS_DPAA_FMAN /**
drivers/net/fm/fm.c +1 -0
@@ -8,6 +8,7 @@#include <malloc.h> #include <asm/io.h> #include <linux/errno.h> +#include <u-boot/crc.h> #include "fm.h" #include <fsl_qe.h> /* For struct qe_firmware */
drivers/qe/qe.c +1 -0
@@ -14,6 +14,7 @@#include <linux/immap_qe.h> #include <fsl_qe.h> #include <mmc.h> +#include <u-boot/crc.h> #ifdef CONFIG_ARCH_LS1021A #include <asm/arch/immap_ls102xa.h>
env/common.c +1 -0
@@ -15,6 +15,7 @@#include <search.h> #include <errno.h> #include <malloc.h> +#include <u-boot/crc.h> DECLARE_GLOBAL_DATA_PTR ;
env/eeprom.c +1 -0
@@ -12,6 +12,7 @@#include <env.h> #include <env_internal.h> #include <linux/stddef.h> +#include <u-boot/crc.h> #if defined(CONFIG_I2C_ENV_EEPROM_BUS )#include <i2c.h> #endif
env/flash.c +1 -0
@@ -17,6 +17,7 @@#include <malloc.h> #include <search.h> #include <errno.h> +#include <u-boot/crc.h> DECLARE_GLOBAL_DATA_PTR ;
env/nand.c +1 -0
@@ -23,6 +23,7 @@#include <nand.h> #include <search.h> #include <errno.h> +#include <u-boot/crc.h> #if defined(CONFIG_CMD_SAVEENV ) && defined(CONFIG_CMD_NAND ) && \ !defined(CONFIG_SPL_BUILD )
env/nvram.c +1 -0
@@ -30,6 +30,7 @@#include <linux/stddef.h> #include <search.h> #include <errno.h> +#include <u-boot/crc.h> DECLARE_GLOBAL_DATA_PTR ;
env/remote.c +1 -0
@@ -9,6 +9,7 @@#include <command.h> #include <env_internal.h> #include <linux/stddef.h> +#include <u-boot/crc.h> #ifdef ENV_IS_EMBEDDED env_t *env_ptr = &environment;
env/sf.c +1 -0
@@ -18,6 +18,7 @@#include <search.h> #include <errno.h> #include <dm/device-internal.h> +#include <u-boot/crc.h> #ifndef CONFIG_SPL_BUILD #define CMD_SAVEENV
examples/api/glue.c +1 -0
@@ -7,6 +7,7 @@#include <env.h> #include <linux/types.h> #include <api_public.h> +#include <u-boot/crc.h> #include "glue.h"
fs/jffs2/jffs2_1pass.c +1 -0
@@ -118,6 +118,7 @@#include <linux/compiler.h> #include <linux/stat.h> #include <linux/time.h> +#include <u-boot/crc.h> #include <watchdog.h> #include <jffs2/jffs2.h> #include <jffs2/jffs2_1pass.h>
fs/ubifs/io.c +1 -0
@@ -61,6 +61,7 @@#ifndef __UBOOT__#include <linux/crc32.h> #include <linux/slab.h> +#include <u-boot/crc.h> #else #include <linux/compat.h> #include <linux/err.h>
fs/ubifs/recovery.c +1 -0
@@ -38,6 +38,7 @@#ifndef __UBOOT__#include <linux/crc32.h> #include <linux/slab.h> +#include <u-boot/crc.h> #else #include <linux/err.h> #endif
fs/ubifs/tnc.c +1 -0
@@ -21,6 +21,7 @@#ifndef __UBOOT__#include <linux/crc32.h> #include <linux/slab.h> +#include <u-boot/crc.h> #else #include <linux/compat.h> #include <linux/err.h>
include/common.h +0 -3
@@ -322,9 +322,6 @@ int strcmp_compar(const void *, const void *);/* lib/strmhz.c */ char *strmhz (char *buf,unsigned long hz); -/* lib/crc32.c */ -#include <u-boot/crc.h> -/* * STDIO based functions (can always be used) */
lib/crc32.c +1 -0
@@ -10,6 +10,7 @@#ifdef USE_HOSTCC #include <arpa/inet.h> +#include <u-boot/crc.h> #else #include <common.h> #include <efi_loader.h>
lib/efi_loader/efi_boottime.c +1 -0
@@ -13,6 +13,7 @@#include <u-boot/crc.h> #include <bootm.h> #include <pe.h> +#include <u-boot/crc.h> #include <watchdog.h> DECLARE_GLOBAL_DATA_PTR ;
lib/efi_loader/efi_runtime.c +1 -0
@@ -11,6 +11,7 @@#include <elf.h> #include <efi_loader.h> #include <rtc.h> +#include <u-boot/crc.h> /* For manual relocation support */ DECLARE_GLOBAL_DATA_PTR ;
lib/efi_loader/efi_variable.c +1 -0
@@ -11,6 +11,7 @@#include <hexdump.h> #include <malloc.h> #include <search.h> +#include <u-boot/crc.h> #define READ_ONLY BIT(31)
lib/efi_selftest/efi_selftest_config_table.c +1 -0
@@ -9,6 +9,7 @@*/ #include <efi_selftest.h> +#include <u-boot/crc.h> static const struct efi_system_table *sys_table;static struct efi_boot_services *boottime;
lib/efi_selftest/efi_selftest_crc32.c +1 -0
@@ -10,6 +10,7 @@*/ #include <efi_selftest.h> +#include <u-boot/crc.h> const struct efi_system_table *st; efi_status_t (EFIAPI *bs_crc32)(const void *data, efi_uintn_t data_size,
lib/gunzip.c +1 -0
@@ -12,6 +12,7 @@#include <image.h> #include <malloc.h> #include <memalign.h> +#include <u-boot/crc.h> #include <watchdog.h> #include <u-boot/zlib.h>
lib/zlib/deflate.c +1 -0
@@ -50,6 +50,7 @@/* @(#) $Id$ */ #include "deflate.h" +#include <u-boot/crc.h> const char deflate_copyright[] =" deflate 1.2.5 Copyright 1995-2010 Jean-loup Gailly and Mark Adler " ;
tools/default_image.c +1 -0
@@ -15,6 +15,7 @@#include "imagetool.h" #include "mkimage.h" +#include <u-boot/crc.h> #include <image.h> #include <tee/optee.h>
tools/env/fw_env.c +1 -0
@@ -25,6 +25,7 @@#include <sys/types.h> #include <sys/ioctl.h> #include <sys/stat.h> +#include <u-boot/crc.h> #include <unistd.h> #include <dirent.h>
tools/env/fw_env.h +0 -2
@@ -160,5 +160,3 @@ int fw_env_close(struct env_opts *opts);* version string of the library */ char *fw_env_version (void ); - -unsigned long crc32 (unsigned long ,const unsigned char *,unsigned );
tools/envcrc.c +1 -0
@@ -9,6 +9,7 @@#include <stdint.h> #include <stdlib.h> #include <string.h> +#include <u-boot/crc.h> #include <unistd.h> #include <linux/kconfig.h>
tools/mkenvimage.c +1 -0
@@ -14,6 +14,7 @@#include <stdlib.h> #include <stdint.h> #include <string.h> +#include <u-boot/crc.h> #include <unistd.h> #include <libgen.h> #include <sys/types.h>
tools/mxsimage.c +1 -0
@@ -11,6 +11,7 @@#include <fcntl.h> #include <stdio.h> #include <string.h> +#include <u-boot/crc.h> #include <unistd.h> #include <limits.h>
tools/pbl_crc32.c +1 -0
@@ -5,6 +5,7 @@* Cleaned up and refactored by Charles Manning. */ #include "pblimage.h" +#include <u-boot/crc.h> static uint32_t crc_table[256 ];static int crc_table_valid;
tools/pblimage.c +1 -0
@@ -6,6 +6,7 @@#include <image.h> #include "pblimage.h" #include "pbl_crc32.h" +#include <u-boot/crc.h> #define roundup (x, y) ((((x) + ((y) - 1)) / (y)) * (y))#define PBL_ACS_CONT_CMD 0x81000000
tools/socfpgaimage.c +1 -0
@@ -55,6 +55,7 @@#include "pbl_crc32.h" #include "imagetool.h" #include "mkimage.h" +#include <u-boot/crc.h> #include <image.h>
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 8/41 crc32: Use the crc.h header for crc functions
Quoted 7 lines · Simon Glass
Drop inclusion of
crc.hincommon.hand use the correct header directly instead.With this we can drop the conflicting definition in
fw_env.hand rely on thecrc.hheader, which is already included.Signed-off-by Simon Glass <[email protected]>
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/f1d7ae6d/attachment.sig>
PATCH v2 9/41 spl: bootcount: Move code out of header file
In reply to Simon GlassIt is not good practice to write code in a header file. If it is included multiple times then the code can cause duplicate functions.
Move the bootcount_store() and bootcount_load() functions into SPL.
Note: bootcount is a bit strange in that it uses driver model but does not define proper drivers. This should be fixed.
---
Changes in v2: None
common/spl/spl.c | 11 +++++++++++ include/bootcount.h | 4 ---- 2 files changed, 11 insertions(+), 4 deletions(-)
common/spl/spl.c +11 -0
@@ -830,3 +830,14 @@ ulong spl_relocate_stack_gd(void)return 0 ;#endif } + +#if defined(CONFIG_BOOTCOUNT_LIMIT ) && !defined(CONFIG_SPL_BOOTCOUNT_LIMIT ) +void bootcount_store (ulong a) +{ +} + +ulong bootcount_load (void ) +{ +return 0 ; +} +#endif
include/bootcount.h +0 -4
@@ -127,10 +127,6 @@ static inline void bootcount_inc(void)#endif /* !CONFIG_SPL_BUILD */ } -#if defined(CONFIG_SPL_BUILD ) && !defined(CONFIG_SPL_BOOTCOUNT_LIMIT ) -void bootcount_store (ulong a) {}; -ulong bootcount_load (void ) {return 0 ; } -#endif /* CONFIG_SPL_BUILD && !CONFIG_SPL_BOOTCOUNT_LIMIT */ #else static inline int bootcount_error (void ) {return 0 ; }static inline void bootcount_inc (void ) {}
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 9/41 spl: bootcount: Move code out of header file
Quoted 41 lines · Simon Glass
It is not good practice to write code in a header file. If it is included multiple times then the code can cause duplicate functions.
Move the
bootcount_store()andbootcount_load()functions into SPL.Note: bootcount is a bit strange in that it uses driver model but does not define proper drivers. This should be fixed.
Signed-off-by Simon Glass <[email protected]>---
Changes in v2: None
common/spl/spl.c | 11 +++++++++++ include/bootcount.h | 4 ---- 2 files changed, 11 insertions(+), 4 deletions(-)common/spl/spl.c +11
-0@@ -830,3 +830,14 @@ ulong spl_relocate_stack_gd(void)return 0 ;#endif } + +#if defined(CONFIG_BOOTCOUNT_LIMIT ) && !defined(CONFIG_SPL_BOOTCOUNT_LIMIT ) +void bootcount_store (ulong a) +{ +} + +ulong bootcount_load (void ) +{ +return 0 ; +} +#endif include/bootcount.h +0
-0
include/bootcount.h static inline void bootcount_inc(void) · line 132
Quoted 10 lines
include/bootcount.h +0
-4@@ -127,10 +127,6 @@ static inline void bootcount_inc(void)#endif /* !CONFIG_SPL_BUILD */ } -#if defined(CONFIG_SPL_BUILD ) && !defined(CONFIG_SPL_BOOTCOUNT_LIMIT ) -void bootcount_store (ulong a) {}; -ulong bootcount_load (void ) {return 0 ; } -#endif /* CONFIG_SPL_BUILD && !CONFIG_SPL_BOOTCOUNT_LIMIT */ #else static inline int bootcount_error (void ) {return 0 ; }static inline void bootcount_inc (void ) {}
Adding a few folks that have touched bootcount of late to chime in here, 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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/6ed1616e/attachment.sig>
PATCH v2 10/41 common: Move bootcount functions to their header file
In reply to Simon GlassThese don't need to be in common.h so move them out.
---
Changes in v2: None
board/BuR/brppt1/board.c | 1 + include/bootcount.h | 10 ++++++++++ include/common.h | 4 ---- 3 files changed, 11 insertions(+), 4 deletions(-)
board/BuR/brppt1/board.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <bootcount.h> #include <env.h> #include <errno.h> #include <spl.h>
include/bootcount.h +10 -0
@@ -59,6 +59,16 @@ int dm_bootcount_set(struct udevice *dev, u32 bootcount);#endif +/** bootcount_store() - store the current bootcount */ +void bootcount_store (ulong ); + +/** +* bootcount_load() - load the current bootcount +* +* @return bootcount, read from the appropriate location +*/ +ulong bootcount_load (void ); +#if defined(CONFIG_SPL_BOOTCOUNT_LIMIT ) || defined(CONFIG_BOOTCOUNT_LIMIT )#if !defined(CONFIG_SYS_BOOTCOUNT_LE ) && !defined(CONFIG_SYS_BOOTCOUNT_BE )
include/common.h +0 -4
@@ -266,10 +266,6 @@ unsigned long timer_get_us(void);void enable_interrupts (void );int disable_interrupts (void ); -/* $(CPU)/.../commproc.c */ -void bootcount_store (ulong ); -ulong bootcount_load (void ); -/* $(CPU)/.../<eth> */ void mii_init (void );
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 10/41 common: Move bootcount functions to their header file
Quoted 3 lines · Simon Glass
These don't need to be in
common.hso move them out.Signed-off-by Simon Glass <[email protected]>
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/bc75881d/attachment.sig>
PATCH v2 11/41 common: Move sorting functions to their own header file
In reply to Simon GlassThese don't need to be in common.h so move them out into a new header. Also add some missing comments.
---
Changes in v2: None
cmd/efi.c | 1 + common/bootstage.c | 1 + env/common.c | 1 + fs/yaffs2/yaffs_qsort.c | 1 + include/common.h | 5 ----- include/sort.h | 34 ++++++++++++++++++++++++++++++++++ lib/hashtable.c | 1 + lib/qsort.c | 1 + 8 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 include/sort.h
cmd/efi.c +1 -0
@@ -9,6 +9,7 @@#include <efi.h> #include <errno.h> #include <malloc.h> +#include <sort.h> static const char *const type_name[] = {"reserved" ,
common/bootstage.c +1 -0
@@ -11,6 +11,7 @@#include <common.h> #include <malloc.h> +#include <sort.h> #include <spl.h> #include <linux/compiler.h> #include <linux/libfdt.h>
env/common.c +1 -0
@@ -11,6 +11,7 @@#include <command.h> #include <env.h> #include <env_internal.h> +#include <sort.h> #include <linux/stddef.h> #include <search.h> #include <errno.h>
fs/yaffs2/yaffs_qsort.c +1 -0
@@ -5,6 +5,7 @@*/ #include "yportenv.h" +#include <sort.h> /* #include <linux/string.h> */ /*
include/common.h +0 -5
@@ -304,11 +304,6 @@ ulong ticks2usec (unsigned long ticks);/* lib/lz4_wrapper.c */ int ulz4fn (const void *src,size_t srcn,void *dst,size_t *dstn); -/* lib/qsort.c */ -void qsort (void *base,size_t nmemb,size_t size, -int (*compar)(const void *,const void *)); -int strcmp_compar (const void *,const void *); -/* lib/uuid.c */ #include <uuid.h>
include/sort.h new file +34 -0
@@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright 2019 Google LLC +*/ + +#ifndef __SORT_H +#define __SORT_H + +/** +* qsort() - Use the quicksort algorithm to sort some values +* +* @base: Base address of array to sort +* @nmemb: Number of members to sort +* @size: Size of each member in bytes +* @compar: Comparison function which should return: +* < 0 if element at s1 < element at s2, +* 0 if element at s1 == element@s2, +* > 0 if element at s1 > element at s2, +*/ +void qsort (void *base,size_t nmemb,size_t size, +int (*compar)(const void *s1,const void *s2)); + +/** +* strcmp_compar() - compar function for string arrays +* +* This can be passed to qsort when a string array is being sorted +* +* @s1: First string to compare +* @s2: Second string to compare +* @return comparison value (less than, equal to, or greater than 0) +*/ +int strcmp_compar (const void *s1,const void *s2); + +#endif
lib/hashtable.c +1 -0
@@ -14,6 +14,7 @@#include <errno.h> #include <malloc.h> +#include <sort.h> #ifdef USE_HOSTCC /* HOST build */ # include <string.h>
lib/qsort.c +1 -0
@@ -18,6 +18,7 @@#include <linux/types.h> #include <common.h> #include <exports.h> +#include <sort.h> void qsort(void *base, size_t nel,
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 11/41 common: Move sorting functions to their own header file
Quoted 4 lines · Simon Glass
These don't need to be in
common.hso move them out into a new header. Also add some missing comments.Signed-off-by Simon Glass <[email protected]>
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/efbbf8d5/attachment.sig>
PATCH v2 12/41 Move strtomhz() to vsprintf.h
In reply to Simon GlassAt present this function sits in its own file but it does not really justify it. There are similar string functions in vsprintf.h, so move it there. Also add the missing function comment.
Use the vsprintf.h include file explicitly where needed.
---
Changes in v2: None
arch/arc/lib/cpu.c | 1 + arch/arm/cpu/arm926ejs/mx25/generic.c | 1 + arch/arm/cpu/arm926ejs/mx27/generic.c | 1 + arch/arm/cpu/armv7/ls102xa/cpu.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 1 + arch/arm/mach-at91/arm926ejs/cpu.c | 1 + arch/arm/mach-at91/armv7/cpu.c | 1 + arch/m68k/cpu/mcf5227x/cpu.c | 1 + arch/m68k/cpu/mcf523x/cpu.c | 1 + arch/m68k/cpu/mcf52x2/cpu.c | 1 + arch/m68k/cpu/mcf530x/cpu.c | 1 + arch/m68k/cpu/mcf532x/cpu.c | 1 + arch/m68k/cpu/mcf5445x/cpu.c | 1 + arch/m68k/cpu/mcf547x_8x/cpu.c | 1 + arch/powerpc/cpu/mpc83xx/cpu.c | 1 + arch/powerpc/cpu/mpc83xx/spd_sdram.c | 1 + arch/powerpc/cpu/mpc83xx/speed.c | 1 + arch/powerpc/cpu/mpc85xx/cpu.c | 1 + arch/powerpc/cpu/mpc86xx/cpu.c | 1 + arch/powerpc/cpu/mpc8xx/cpu.c | 1 + arch/xtensa/cpu/cpu.c | 1 + board/Arcturus/ucp1020/ddr.c | 1 + board/atmel/at91sam9261ek/at91sam9261ek.c | 1 + board/atmel/at91sam9263ek/at91sam9263ek.c | 1 + .../atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 1 + board/atmel/at91sam9n12ek/at91sam9n12ek.c | 1 + board/atmel/at91sam9rlek/at91sam9rlek.c | 1 + board/atmel/common/video_display.c | 1 + board/esd/meesc/meesc.c | 1 + board/freescale/bsc9131rdb/ddr.c | 1 + board/freescale/bsc9132qds/ddr.c | 1 + board/freescale/corenet_ds/ddr.c | 1 + board/freescale/ls1043ardb/ddr.c | 1 + board/freescale/mpc8541cds/mpc8541cds.c | 1 + board/freescale/mpc8548cds/mpc8548cds.c | 1 + board/freescale/mpc8555cds/mpc8555cds.c | 1 + board/freescale/p1010rdb/ddr.c | 1 + board/freescale/p1_p2_rdb_pc/ddr.c | 1 + board/freescale/p1_twr/ddr.c | 1 + board/mini-box/picosam9g45/picosam9g45.c | 1 + board/ronetix/pm9261/pm9261.c | 1 + cmd/bdinfo.c | 1 + drivers/clk/clk_stm32mp1.c | 1 + drivers/clk/mpc83xx_clk.c | 1 + drivers/cpu/mpc83xx_cpu.c | 1 + include/common.h | 3 --- include/vsprintf.h | 10 +++++++++ lib/Makefile | 4 ++-- lib/strmhz.c | 21 ------------------- lib/vsprintf.c | 17 +++++++++++++++ 50 files changed, 74 insertions(+), 26 deletions(-) delete mode 100644 lib/strmhz.c
arch/arc/lib/cpu.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <malloc.h> +#include <vsprintf.h> #include <asm/arcregs.h> #include <asm/cache.h>
arch/arm/cpu/arm926ejs/mx25/generic.c +1 -0
@@ -11,6 +11,7 @@#include <common.h> #include <div64.h> #include <netdev.h> +#include <vsprintf.h> #include <asm/io.h> #include <asm/arch-imx/cpu.h> #include <asm/arch/imx-regs.h>
arch/arm/cpu/arm926ejs/mx27/generic.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <div64.h> #include <netdev.h> +#include <vsprintf.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/clock.h>
arch/arm/cpu/armv7/ls102xa/cpu.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <asm/arch/clock.h> #include <asm/io.h> #include <asm/arch/immap_ls102xa.h>
arch/arm/cpu/armv8/fsl-layerscape/cpu.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <env.h> #include <fsl_ddr_sdram.h> +#include <vsprintf.h> #include <asm/io.h> #include <linux/errno.h> #include <asm/system.h>
arch/arm/mach-at91/arm926ejs/cpu.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <asm/io.h> #include <asm/arch/hardware.h> #include <asm/arch/at91_pit.h>
arch/arm/mach-at91/armv7/cpu.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <asm/io.h> #include <asm/arch/hardware.h> #include <asm/arch/at91_pit.h>
arch/m68k/cpu/mcf5227x/cpu.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <watchdog.h> #include <command.h>
arch/m68k/cpu/mcf523x/cpu.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <watchdog.h> #include <command.h> #include <netdev.h>
arch/m68k/cpu/mcf52x2/cpu.c +1 -0
@@ -14,6 +14,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <watchdog.h> #include <command.h> #include <asm/immap.h>
arch/m68k/cpu/mcf530x/cpu.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <asm/immap.h> #include <asm/io.h>
arch/m68k/cpu/mcf532x/cpu.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <watchdog.h> #include <command.h> #include <netdev.h>
arch/m68k/cpu/mcf5445x/cpu.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <watchdog.h> #include <command.h> #include <netdev.h>
arch/m68k/cpu/mcf547x_8x/cpu.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <watchdog.h> #include <command.h> #include <netdev.h>
arch/powerpc/cpu/mpc83xx/cpu.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <watchdog.h> #include <command.h> #include <mpc83xx.h>
arch/powerpc/cpu/mpc83xx/spd_sdram.c +1 -0
@@ -13,6 +13,7 @@#ifndef CONFIG_MPC83XX_SDRAM #include <common.h> +#include <vsprintf.h> #include <asm/processor.h> #include <asm/io.h> #include <i2c.h>
arch/powerpc/cpu/mpc83xx/speed.c +1 -0
@@ -11,6 +11,7 @@#include <common.h> #include <mpc83xx.h> #include <command.h> +#include <vsprintf.h> #include <asm/processor.h> DECLARE_GLOBAL_DATA_PTR ;
arch/powerpc/cpu/mpc85xx/cpu.c +1 -0
@@ -11,6 +11,7 @@#include <config.h> #include <common.h> #include <cpu_legacy.h> +#include <vsprintf.h> #include <watchdog.h> #include <command.h> #include <fsl_esdhc.h>
arch/powerpc/cpu/mpc86xx/cpu.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <watchdog.h> #include <command.h> #include <asm/cache.h>
arch/powerpc/cpu/mpc8xx/cpu.c +1 -0
@@ -17,6 +17,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <watchdog.h> #include <command.h> #include <mpc8xx.h>
arch/xtensa/cpu/cpu.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <command.h> +#include <vsprintf.h> #include <linux/stringify.h> #include <asm/global_data.h> #include <asm/cache.h>
board/Arcturus/ucp1020/ddr.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> #include <asm/processor.h>
board/atmel/at91sam9261ek/at91sam9261ek.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <debug_uart.h> +#include <vsprintf.h> #include <asm/io.h> #include <asm/arch/at91sam9261.h> #include <asm/arch/at91sam9261_matrix.h>
board/atmel/at91sam9263ek/at91sam9263ek.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <debug_uart.h> +#include <vsprintf.h> #include <linux/sizes.h> #include <asm/arch/at91sam9263.h> #include <asm/arch/at91sam9_smc.h>
board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <debug_uart.h> +#include <vsprintf.h> #include <asm/io.h> #include <asm/arch/clk.h> #include <asm/arch/at91sam9g45_matrix.h>
board/atmel/at91sam9n12ek/at91sam9n12ek.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <asm/io.h> #include <asm/arch/at91sam9x5_matrix.h> #include <asm/arch/at91sam9_smc.h>
board/atmel/at91sam9rlek/at91sam9rlek.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <debug_uart.h> +#include <vsprintf.h> #include <asm/io.h> #include <asm/mach-types.h> #include <asm/arch/at91sam9rl.h>
board/atmel/common/video_display.c +1 -0
@@ -11,6 +11,7 @@#include <version.h> #include <video.h> #include <video_console.h> +#include <vsprintf.h> #include <asm/io.h> #include <asm/arch/clk.h>
board/esd/meesc/meesc.c +1 -0
@@ -11,6 +11,7 @@#include <common.h> #include <env.h> +#include <vsprintf.h> #include <asm/io.h> #include <asm/gpio.h> #include <asm/mach-types.h>
board/freescale/bsc9131rdb/ddr.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> #include <asm/processor.h>
board/freescale/bsc9132qds/ddr.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> #include <asm/processor.h>
board/freescale/corenet_ds/ddr.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <i2c.h> #include <hwconfig.h> +#include <vsprintf.h> #include <asm/mmu.h> #include <fsl_ddr_sdram.h> #include <fsl_ddr_dimm_params.h>
board/freescale/ls1043ardb/ddr.c +1 -0
@@ -7,6 +7,7 @@#include <fsl_ddr_sdram.h> #include <fsl_ddr_dimm_params.h> #include "ddr.h" +#include <vsprintf.h> #ifdef CONFIG_FSL_DEEP_SLEEP #include <fsl_sleep.h> #endif
board/freescale/mpc8541cds/mpc8541cds.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <pci.h> +#include <vsprintf.h> #include <asm/processor.h> #include <asm/mmu.h> #include <asm/immap_85xx.h>
board/freescale/mpc8548cds/mpc8548cds.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <pci.h> +#include <vsprintf.h> #include <asm/processor.h> #include <asm/mmu.h> #include <asm/immap_85xx.h>
board/freescale/mpc8555cds/mpc8555cds.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <pci.h> +#include <vsprintf.h> #include <asm/processor.h> #include <asm/mmu.h> #include <asm/immap_85xx.h>
board/freescale/p1010rdb/ddr.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> #include <asm/processor.h>
board/freescale/p1_p2_rdb_pc/ddr.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> #include <asm/processor.h>
board/freescale/p1_twr/ddr.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> #include <asm/processor.h>
board/mini-box/picosam9g45/picosam9g45.c +1 -0
@@ -11,6 +11,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <asm/io.h> #include <asm/arch/clk.h> #include <asm/arch/at91sam9g45_matrix.h>
board/ronetix/pm9261/pm9261.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <vsprintf.h> #include <linux/sizes.h> #include <asm/io.h> #include <asm/gpio.h>
cmd/bdinfo.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <command.h> #include <env.h> +#include <vsprintf.h> #include <linux/compiler.h> DECLARE_GLOBAL_DATA_PTR ;
drivers/clk/clk_stm32mp1.c +1 -0
@@ -10,6 +10,7 @@#include <regmap.h> #include <spl.h> #include <syscon.h> +#include <vsprintf.h> #include <linux/io.h> #include <linux/iopoll.h> #include <dt-bindings/clock/stm32mp1-clks.h>
drivers/clk/mpc83xx_clk.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <clk-uclass.h> #include <dm.h> +#include <vsprintf.h> #include <dm/lists.h> #include <dt-bindings/clk/mpc83xx-clk.h> #include <asm/arch/soc.h>
drivers/cpu/mpc83xx_cpu.c +1 -0
@@ -9,6 +9,7 @@#include <clk.h> #include <cpu.h> #include <dm.h> +#include <vsprintf.h> #include "mpc83xx_cpu.h"
include/common.h +0 -3
@@ -310,9 +310,6 @@ int ulz4fn(const void *src, size_t srcn, void *dst, size_t *dstn);/* lib/vsprintf.c */ #include <vsprintf.h> -/* lib/strmhz.c */ -char *strmhz (char *buf,unsigned long hz); -/* * STDIO based functions (can always be used) */
include/vsprintf.h +10 -0
@@ -212,4 +212,14 @@ void print_grouped_ull(unsigned long long int_val, int digits);bool str2off (const char *p,loff_t *num);bool str2long (const char *p,ulong *num); + +/** +* strmhz() - Convert a value to a Hz string +* +* This creates a string indicating the number of MHz of a value. For example, +* 2700000 produces "2.7". +* @buf: Buffer to hold output string, which must be large enough +* @hz: Value to convert +*/ +char *strmhz (char *buf,unsigned long hz);#endif
lib/Makefile +2 -2
@@ -109,12 +109,12 @@ ifeq ($(CONFIG_$(SPL_TPL_)BUILD),y) ifdef CONFIG_$(SPL_TPL_)USE_TINY_PRINTF obj-$(CONFIG_$(SPL_TPL_)SPRINTF) += tiny-printf.o else -obj-$(CONFIG_$(SPL_TPL_)SPRINTF) += vsprintf.o strmhz.o +obj-$(CONFIG_$(SPL_TPL_)SPRINTF) += vsprintf.o endif obj-$(CONFIG_$(SPL_TPL_)STRTO) += strto.o else # Main U-Boot always uses the full printf support -obj-y += vsprintf.o strto.o strmhz.o +obj-y += vsprintf.o strto.o endif subdir-ccflags-$(CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED) += -O2
lib/strmhz.c deleted +0 -21
@@ -1,21 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* (C) Copyright 2002-2006 -* Wolfgang Denk, DENX Software Engineering, wd at denx.de. -*/ -#include <common.h> - -char *strmhz (char *buf,unsigned long hz) -{ -long l, n; -long m; - - n =DIV_ROUND_CLOSEST (hz,1000 ) /1000L ; - l =sprintf (buf,"%ld" , n); - - hz -= n *1000000L ; - m =DIV_ROUND_CLOSEST (hz,1000L ); -if (m !=0 ) -sprintf (buf + l,".%03ld" , m); -return (buf); -}
lib/vsprintf.c +17 -0
@@ -17,6 +17,7 @@#include <div64.h> #include <hexdump.h> #include <stdarg.h> +#include <vsprintf.h> #include <linux/ctype.h> #include <linux/err.h> #include <linux/types.h>
@@ -873,3 +874,19 @@ bool str2long(const char *p, ulong *num) *num =simple_strtoul (p, &endptr,16 );return *p !='\0' && *endptr =='\0' ; } + +char *strmhz (char *buf,unsigned long hz) +{ +long l, n; +long m; + + n =DIV_ROUND_CLOSEST (hz,1000 ) /1000L ; + l =sprintf (buf,"%ld" , n); + + hz -= n *1000000L ; + m =DIV_ROUND_CLOSEST (hz,1000L ); +if (m !=0 ) +sprintf (buf + l,".%03ld" , m); + +return buf; +}
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 12/41 Move strtomhz() to vsprintf.h
Quoted 7 lines · Simon Glass
At present this function sits in its own file but it does not really justify it. There are similar string functions in
vsprintf.h, so move it there. Also add the missing function comment.Use the
vsprintf.hinclude file explicitly where needed.Signed-off-by Simon Glass <[email protected]>
[snip]
Quoted 11 lines
lib/strmhz.c deleted +0
-5@@ -1,21 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* (C) Copyright 2002-2006 -* Wolfgang Denk, DENX Software Engineering, wd at denx.de. -*/
[snip]
lib/vsprintf.c
Quoted 4 lines
lib/vsprintf.c +0
-0
Need to move the copyright to this file now too.
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/6fb0c822/attachment.sig>
PATCH v2 13/41 common: Move env_get_ip() to net.h
In reply to Simon GlassThis function relates to networking, so move it out of the common.h header file.
---
Changes in v2: None
include/common.h | 4 ---- include/net.h | 21 ++++++++++++++++++++- 2 files changed, 20 insertions(+), 5 deletions(-)
include/common.h +0 -4
@@ -319,10 +319,6 @@ int serial_printf (const char *fmt, ...)/* lib/net_utils.c */ #include <net.h> -static inline struct in_addr env_get_ip (char *var) -{ -return string_to_ip (env_get (var)); -}#include <bootstage.h>
include/net.h +20 -1
@@ -829,7 +829,13 @@ static inline void net_random_ethaddr(uchar *addr)/* Convert an IP address to a string */ void ip_to_string (struct in_addr x,char *s); -/* Convert a string to ip address */ +/** +* string_to_ip() - Convert a string to ip address +* +* @s: String to conver, in the format format a.b.c.d, where each value is a +* decimal number from 0 to 255 +* @return IP address, or 0 if invalid +*/ struct in_addr string_to_ip (const char *s);/* Convert a VLAN id to a string */
@@ -887,4 +893,17 @@ int update_tftp(ulong addr, char *interface, char *devstring);*/ void eth_parse_enetaddr (const char *addr,uint8_t *enetaddr); +/** +* env_get_ip() - Convert an environment value to to an ip address +* +* @var: Environment variable to convert. The value of this variable must be +* in the format format a.b.c.d, where each value is a decimal number from +* 0 to 255 +* @return IP address, or 0 if invalid +*/ +static inline struct in_addr env_get_ip (char *var) +{ +return string_to_ip (env_get (var)); +} +#endif /* __NET_H__ */
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 13/41 common: Move env_get_ip() to net.h
Quoted 4 lines · Simon Glass
This function relates to networking, so move it out of the
common.hheader file.Signed-off-by Simon Glass <[email protected]>
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/c9b8be22/attachment.sig>
PATCH v2 14/41 serial: usb: Correct the usbtty_...() prototypes
In reply to Simon GlassThe function declarations in serial.h are not in sync with what is currently used in usbtty. Fix this by updating the header and including it, to help catch future such problems.
---
Changes in v2: None
drivers/serial/usbtty.c | 1 + include/serial.h | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-)
drivers/serial/usbtty.c +1 -0
@@ -11,6 +11,7 @@#include <config.h> #include <circbuf.h> #include <env.h> +#include <serial.h> #include <stdio_dev.h> #include <asm/unaligned.h> #include "usbtty.h"
include/serial.h +10 -8
@@ -50,18 +50,20 @@ extern void serial_reinit_all(void);/* For usbtty */ #ifdef CONFIG_USB_TTY -extern int usbtty_getc (void ); -extern void usbtty_putc (const char c); -extern void usbtty_puts (const char *str); -extern int usbtty_tstc (void ); +struct stdio_dev ; + +int usbtty_getc (struct stdio_dev *dev); +void usbtty_putc (struct stdio_dev *dev,const char c); +void usbtty_puts (struct stdio_dev *dev,const char *str); +int usbtty_tstc (struct stdio_dev *dev);#else /* stubs */ -#define usbtty_getc () 0 -#define usbtty_putc (a) -#define usbtty_puts (a) -#define usbtty_tstc () 0 +#define usbtty_getc (dev) 0 +#define usbtty_putc (dev, a) +#define usbtty_puts (dev, a) +#define usbtty_tstc (dev) 0#endif /* CONFIG_USB_TTY */
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 14/41 serial: usb: Correct the usbtty_...() prototypes
Quoted 5 lines · Simon Glass
The function declarations in
serial.hare not in sync with what is currently used in usbtty. Fix this by updating the header and including it, to help catch future such problems.Signed-off-by Simon Glass <[email protected]>
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/c0eb3273/attachment.sig>
PATCH v2 15/41 common: Move serial_printf() to the serial header
In reply to Simon GlassMove this function header to serial.h since this function is clearly related to serial. The function itself stays in console.c since we don't have a single serial file. DM and non-DM each has a separate file so we would have to either create a new common serial file, or repeat the function in both serial.c and serial-uclass.c, neither of which seem worthwhile.
---
Changes in v2: None
drivers/usb/gadget/core.c | 1 + drivers/usb/gadget/designware_udc.c | 1 + drivers/usb/gadget/ep0.c | 3 ++- drivers/usb/musb-new/omap2430.c | 1 + drivers/usb/musb/musb_udc.c | 1 + drivers/usb/musb/omap3.c | 1 + include/common.h | 7 ------- include/serial.h | 11 +++++++++++ 8 files changed, 18 insertions(+), 8 deletions(-)
drivers/usb/gadget/core.c +1 -0
@@ -16,6 +16,7 @@*/ #include <malloc.h> +#include <serial.h> #include <usbdevice.h> #define MAX_INTERFACES 2
drivers/usb/gadget/designware_udc.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <serial.h> #include <asm/io.h> #include <env.h>
drivers/usb/gadget/ep0.c +2 -1
@@ -37,6 +37,7 @@*/ #include <common.h> +#include <serial.h> #include <usbdevice.h> #if 0
@@ -581,7 +582,7 @@ int ep0_recv_setup (struct urb *urb) device->interface =le16_to_cpu (request->wIndex); device->alternate =le16_to_cpu (request->wValue);/*dbg_ep0(2, "set interface: %d alternate: %d", device->interface, device->alternate); */ -serial_printf ("DEVICE_SET_INTERFACE.. event?\n" ); +serial_printf ("DEVICE_SET_INTERFACE.. event?\n" );return 0 ;case USB_REQ_GET_STATUS :
drivers/usb/musb-new/omap2430.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> #include <dm.h> +#include <serial.h> #include <dm/device-internal.h> #include <dm/lists.h> #include <linux/usb/otg.h>
drivers/usb/musb/musb_udc.c +1 -0
@@ -38,6 +38,7 @@*/ #include <common.h> +#include <serial.h> #include <usbdevice.h> #include <usb/udc.h> #include "../gadget/ep0.h"
drivers/usb/musb/omap3.c +1 -0
@@ -16,6 +16,7 @@* ------------------------------------------------------------------------ */ +#include <serial.h> #include <asm/omap_common.h> #include <twl4030.h> #include <twl6030.h>
include/common.h +0 -7
@@ -310,13 +310,6 @@ int ulz4fn(const void *src, size_t srcn, void *dst, size_t *dstn);/* lib/vsprintf.c */ #include <vsprintf.h> -/* -* STDIO based functions (can always be used) -*/ -/* serial stuff */ -int serial_printf (const char *fmt, ...) - __attribute__ ((format (__printf__,1 ,2 ))); -/* lib/net_utils.c */ #include <net.h>
include/serial.h +11 -0
@@ -324,4 +324,15 @@ void pl01x_serial_initialize(void);void pxa_serial_initialize (void );void sh_serial_initialize (void ); +/** +* serial_printf() - Write a formatted string to the serial console +* +* The total size of the output must be less than CONFIG_SYS_PBSIZE. +* +* @fmt: Printf format string, followed by format arguments +* @return number of characters written +*/ +int serial_printf (const char *fmt, ...) + __attribute__ ((format (__printf__,1 ,2 ))); +#endif
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 15/41 common: Move serial_printf() to the serial header
Quoted 8 lines · Simon Glass
Move this function header to
serial.hsince this function is clearly related to serial. The function itself stays inconsole.csince we don't have a single serial file. DM and non-DM each has a separate file so we would have to either create a new common serial file, or repeat the function in bothserial.candserial-uclass.c, neither of which seem worthwhile.Signed-off-by Simon Glass <[email protected]>
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/978e4739/attachment.sig>
PATCH v2 16/41 common: Move serial functions out of common.h
In reply to Simon GlassThese functions belong in serial.h so move them over.
---
Changes in v2: None
arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 1 + board/amarula/vyasa-rk3288/vyasa-rk3288.c | 1 + board/astro/mcf5373l/mcf5373l.c | 1 + board/birdland/bav335x/board.c | 1 + board/bticino/mamoj/spl.c | 1 + board/cssi/MCR3000/MCR3000.c | 1 + board/engicam/common/spl.c | 1 + board/esd/meesc/meesc.c | 1 + board/gumstix/pepper/board.c | 1 + board/isee/igep003x/board.c | 1 + board/isee/igep00x0/spl.c | 1 + board/liebherr/display5/spl.c | 1 + board/liebherr/mccmon6/mccmon6.c | 1 + board/liebherr/mccmon6/spl.c | 1 + board/logicpd/am3517evm/am3517evm.c | 1 + board/logicpd/imx6/imx6logic.c | 1 + board/logicpd/omap3som/omap3logic.c | 1 + board/overo/common.c | 1 + board/siemens/common/board.c | 1 + board/silica/pengwyn/board.c | 1 + board/st/stm32f746-disco/stm32f746-disco.c | 1 + board/tcl/sl50/board.c | 1 + board/ti/am57xx/board.c | 1 + board/ti/beagle/beagle.c | 1 + board/ti/dra7xx/evm.c | 1 + board/ti/evm/evm.c | 1 + board/vscom/baltos/board.c | 1 + cmd/load.c | 1 + common/board_f.c | 1 + common/kgdb_stubs.c | 1 + common/lcd_console.c | 1 + common/spl/spl.c | 1 + include/common.h | 9 --------- include/serial.h | 8 ++++++++ 34 files changed, 40 insertions(+), 9 deletions(-)
arch/arm/cpu/arm926ejs/mxs/spl_boot.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <config.h> +#include <serial.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/sys_proto.h>
board/amarula/vyasa-rk3288/vyasa-rk3288.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <serial.h> #ifndef CONFIG_TPL_BUILD
board/astro/mcf5373l/mcf5373l.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <serial.h> #include <watchdog.h> #include <command.h> #include <asm/m5329.h>
board/birdland/bav335x/board.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <env.h> #include <errno.h> +#include <serial.h> #include <spl.h> #include <asm/arch/cpu.h> #include <asm/arch/hardware.h>
board/bticino/mamoj/spl.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <serial.h> #include <spl.h> #include <asm/io.h>
board/cssi/MCR3000/MCR3000.c +1 -0
@@ -12,6 +12,7 @@#include <hwconfig.h> #include <mpc8xx.h> #include <fdt_support.h> +#include <serial.h> #include <asm/io.h> #include <dm/uclass.h> #include <wdt.h>
board/engicam/common/spl.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <serial.h> #include <spl.h> #include <asm/io.h>
board/esd/meesc/meesc.c +1 -0
@@ -11,6 +11,7 @@#include <common.h> #include <env.h> +#include <serial.h> #include <vsprintf.h> #include <asm/io.h> #include <asm/gpio.h>
board/gumstix/pepper/board.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <env.h> #include <errno.h> +#include <serial.h> #include <spl.h> #include <asm/arch/cpu.h> #include <asm/arch/hardware.h>
board/isee/igep003x/board.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <env.h> #include <errno.h> +#include <serial.h> #include <spl.h> #include <asm/arch/cpu.h> #include <asm/arch/hardware.h>
board/isee/igep00x0/spl.c +1 -0
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0+ +#include <serial.h> #include <asm/io.h> #include <asm/arch/mem.h> #include <asm/arch/sys_proto.h>
board/liebherr/display5/spl.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <env.h> +#include <serial.h> #include <spl.h> #include <linux/libfdt.h> #include <asm/io.h>
board/liebherr/mccmon6/mccmon6.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <env.h> +#include <serial.h> #include <asm/arch/clock.h> #include <asm/arch/iomux.h> #include <asm/arch/imx-regs.h>
board/liebherr/mccmon6/spl.c +1 -0
@@ -18,6 +18,7 @@#include <asm/arch/crm_regs.h> #include <asm/io.h> #include <asm/arch/sys_proto.h> +#include <serial.h> #include <spl.h> #include <asm/arch/mx6-ddr.h>
board/logicpd/am3517evm/am3517evm.c +1 -0
@@ -13,6 +13,7 @@#include <common.h> #include <dm.h> #include <ns16550.h> +#include <serial.h> #include <asm/io.h> #include <asm/omap_musb.h> #include <asm/arch/am35x_def.h>
board/logicpd/imx6/imx6logic.c +1 -0
@@ -14,6 +14,7 @@#include <input.h> #include <mmc.h> #include <fsl_esdhc_imx.h> +#include <serial.h> #include <asm/io.h> #include <asm/gpio.h> #include <linux/sizes.h>
board/logicpd/omap3som/omap3logic.c +1 -0
@@ -17,6 +17,7 @@#include <flash.h> #include <nand.h> #include <i2c.h> +#include <serial.h> #include <twl4030.h> #include <asm/io.h> #include <asm/arch/mmc_host_def.h>
board/overo/common.c +1 -0
@@ -11,6 +11,7 @@* (C) Copyright 2004-2008 * Texas Instruments, <www.ti.com> */ +#include <serial.h> #include <twl4030.h> #include <common.h> #include <asm/io.h>
board/siemens/common/board.c +1 -0
@@ -12,6 +12,7 @@#include <common.h> #include <env.h> #include <errno.h> +#include <serial.h> #include <spl.h> #include <asm/arch/cpu.h> #include <asm/arch/hardware.h>
board/silica/pengwyn/board.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <env.h> +#include <serial.h> #include <asm/arch/cpu.h> #include <asm/arch/hardware.h> #include <asm/arch/ddr_defs.h>
board/st/stm32f746-disco/stm32f746-disco.c +1 -0
@@ -10,6 +10,7 @@#include <miiphy.h> #include <phy_interface.h> #include <ram.h> +#include <serial.h> #include <spl.h> #include <splash.h> #include <st_logo_data.h>
board/tcl/sl50/board.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <env.h> #include <errno.h> +#include <serial.h> #include <spl.h> #include <asm/arch/cpu.h> #include <asm/arch/hardware.h>
board/ti/am57xx/board.c +1 -0
@@ -11,6 +11,7 @@#include <env.h> #include <palmas.h> #include <sata.h> +#include <serial.h> #include <usb.h> #include <asm/omap_common.h> #include <asm/omap_sec_common.h>
board/ti/beagle/beagle.c +1 -0
@@ -16,6 +16,7 @@#include <dm.h> #include <env.h> #include <ns16550.h> +#include <serial.h> #ifdef CONFIG_LED_STATUS #include <status_led.h> #endif
board/ti/dra7xx/evm.c +1 -0
@@ -13,6 +13,7 @@#include <env.h> #include <palmas.h> #include <sata.h> +#include <serial.h> #include <linux/string.h> #include <asm/gpio.h> #include <usb.h>
board/ti/evm/evm.c +1 -0
@@ -15,6 +15,7 @@#include <env.h> #include <ns16550.h> #include <netdev.h> +#include <serial.h> #include <asm/io.h> #include <asm/arch/mem.h> #include <asm/arch/mux.h>
board/vscom/baltos/board.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <env.h> #include <errno.h> +#include <serial.h> #include <linux/libfdt.h> #include <spl.h> #include <asm/arch/cpu.h>
cmd/load.c +1 -0
@@ -14,6 +14,7 @@#include <s_record.h> #include <net.h> #include <exports.h> +#include <serial.h> #include <xyzModem.h> DECLARE_GLOBAL_DATA_PTR ;
common/board_f.c +1 -0
@@ -26,6 +26,7 @@#include <os.h> #include <post.h> #include <relocate.h> +#include <serial.h> #ifdef CONFIG_SPL #include <spl.h> #endif
common/kgdb_stubs.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <kgdb.h> +#include <serial.h> int (*debugger_exception_handler)(struct pt_regs *);
common/lcd_console.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <lcd.h> +#include <serial.h> #include <video_font.h> /* Get font data, width and height */ #if defined(CONFIG_LCD_LOGO )#include <bmp_logo.h>
common/spl/spl.c +1 -0
@@ -11,6 +11,7 @@#include <binman_sym.h> #include <dm.h> #include <handoff.h> +#include <serial.h> #include <spl.h> #include <asm/u-boot.h> #include <nand.h>
include/common.h +0 -9
@@ -238,15 +238,6 @@ void ft_pci_setup(void *blob, bd_t *bd);void smp_set_core_boot_addr (unsigned long addr,int corenr);void smp_kick_all_cpus (void ); -/* $(CPU)/serial.c */ -int serial_init (void ); -void serial_setbrg (void ); -void serial_putc (const char ); -void serial_putc_raw (const char ); -void serial_puts (const char *); -int serial_getc (void ); -int serial_tstc (void ); -/* $(CPU)/speed.c */ int get_clocks (void );ulong get_bus_freq (ulong );
include/serial.h +8 -0
@@ -335,4 +335,12 @@ void sh_serial_initialize(void);int serial_printf (const char *fmt, ...) __attribute__ ((format (__printf__,1 ,2 ))); +int serial_init (void ); +void serial_setbrg (void ); +void serial_putc (const char ch); +void serial_putc_raw (const char ch); +void serial_puts (const char *str); +int serial_getc (void ); +int serial_tstc (void ); +#endif
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 16/41 common: Move serial functions out of common.h
Quoted 3 lines · Simon Glass
These functions belong in
serial.hso move them over.Signed-off-by Simon Glass <[email protected]>
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/bdf7e793/attachment.sig>
PATCH v2 17/41 common: Add a new lz4.h header file
In reply to Simon GlassAdd a header file to house the lz4 compression function. Add a comment while we are here, since it not even clear from the name what the function actuall does.
---
Changes in v2: None
common/image.c | 1 + include/common.h | 3 --- include/lz4.h | 24 ++++++++++++++++++++++++ lib/lz4_wrapper.c | 1 + test/compression.c | 1 + 5 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 include/lz4.h
common/image.c +1 -0
@@ -20,6 +20,7 @@#include <gzip.h> #include <image.h> +#include <lz4.h> #include <mapmem.h> #if IMAGE_ENABLE_FIT ||IMAGE_ENABLE_OF_LIBFDT
include/common.h +0 -3
@@ -292,9 +292,6 @@ void wait_ticks (unsigned long);ulong usec2ticks (unsigned long usec);ulong ticks2usec (unsigned long ticks); -/* lib/lz4_wrapper.c */ -int ulz4fn (const void *src,size_t srcn,void *dst,size_t *dstn); -/* lib/uuid.c */ #include <uuid.h>
include/lz4.h new file +24 -0
@@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright 2019 Google LLC +*/ + +#ifndef __LZ4_H +#define __LZ4_H + +/** +* ulz4fn() - Decompress LZ4 data +* +* @src: Source data to decompress +* @srcn: Length of source data +* @dst: Destination for uncompressed data +* @dstn: Returns length of uncompressed data +* @return 0 if OK, -EPROTONOSUPPORT if the magic number or version number are +* not recognised or independent blocks are used, -EINVAL if the reserved +* fields are non-zero, or input is overrun, -EENOBUFS if the destination +* buffer is overrun, -EEPROTO if the compressed data causes an error in +* the decompression algorithm +*/ +int ulz4fn (const void *src,size_t srcn,void *dst,size_t *dstn); + +#endif
lib/lz4_wrapper.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <compiler.h> #include <image.h> +#include <lz4.h> #include <linux/kernel.h> #include <linux/types.h>
test/compression.c +1 -0
@@ -7,6 +7,7 @@#include <bootm.h> #include <command.h> #include <gzip.h> +#include <lz4.h> #include <malloc.h> #include <mapmem.h> #include <asm/io.h>
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 17/41 common: Add a new lz4.h header file
Quoted 5 lines · Simon Glass
Add a header file to house the lz4 compression function. Add a comment while we are here, since it not even clear from the name what the function actuall does.
Signed-off-by Simon Glass <[email protected]>
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/f9213952/attachment.sig>
PATCH v2 18/41 common: Move some time functions out of common.h
In reply to Simon GlassThese functions belong in time.h so move them over and add comments.
---
Changes in v2: None
arch/arm/cpu/armv7/ls102xa/timer.c | 1 + arch/arm/cpu/armv8/generic_timer.c | 1 + arch/arm/mach-imx/syscounter.c | 1 + arch/arm/mach-imx/timer.c | 1 + arch/m68k/lib/time.c | 1 + arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c | 1 + arch/powerpc/cpu/mpc8xxx/srio.c | 1 + arch/powerpc/lib/time.c | 1 + drivers/crypto/fsl/jr.c | 1 + drivers/i2c/fsl_i2c.c | 1 + include/common.h | 4 ---- include/time.h | 16 ++++++++++++++++ 12 files changed, 26 insertions(+), 4 deletions(-)
arch/arm/cpu/armv7/ls102xa/timer.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <time.h> #include <asm/io.h> #include <div64.h> #include <asm/arch/immap_ls102xa.h>
arch/arm/cpu/armv8/generic_timer.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> +#include <time.h> #include <asm/system.h> DECLARE_GLOBAL_DATA_PTR ;
arch/arm/mach-imx/syscounter.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <time.h> #include <asm/io.h> #include <div64.h> #include <asm/arch/imx-regs.h>
arch/arm/mach-imx/timer.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <time.h> #include <asm/io.h> #include <div64.h> #include <asm/arch/imx-regs.h>
arch/m68k/lib/time.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <time.h> #include <asm/timer.h> #include <asm/immap.h>
arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <env.h> +#include <time.h> #ifdef CONFIG_SYS_P4080_ERRATUM_SERDES8 #include <hwconfig.h> #endif
arch/powerpc/cpu/mpc8xxx/srio.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <config.h> +#include <time.h> #include <asm/fsl_law.h> #include <asm/fsl_serdes.h> #include <asm/fsl_srio.h>
arch/powerpc/lib/time.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <time.h> #include <asm/io.h> /* ------------------------------------------------------------------------- */
drivers/crypto/fsl/jr.c +1 -0
@@ -11,6 +11,7 @@#include "jr.h" #include "jobdesc.h" #include "desc_constr.h" +#include <time.h> #ifdef CONFIG_FSL_CORENET #include <asm/fsl_pamu.h> #endif
drivers/i2c/fsl_i2c.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <command.h> #include <i2c.h> /* Functional interface */ +#include <time.h> #include <asm/io.h> #include <asm/fsl_i2c.h> /* HW definitions */ #include <clk.h>
include/common.h +0 -4
@@ -288,10 +288,6 @@ int cleanup_before_linux_select(int flags);uint64_t get_ticks (void );void wait_ticks (unsigned long ); -/* arch/$(ARCH)/lib/time.c */ -ulong usec2ticks (unsigned long usec); -ulong ticks2usec (unsigned long ticks); -/* lib/uuid.c */ #include <uuid.h>
include/time.h +16 -0
@@ -70,4 +70,20 @@ uint64_t usec_to_tick(unsigned long usec); (time_after_eq (a,b) && \time_before (a,c)) +/** +* usec2ticks() - Convert microseconds to internal ticks +* +* @usec: Value of microseconds to convert +* @return Corresponding internal ticks value, calculated using get_tbclk() + */ +ulong usec2ticks (unsigned long usec); + +/** +* ticks2usec() - Convert internal ticks to microseconds +* +* @ticks: Value of ticks to convert +* @return Corresponding microseconds value, calculated using get_tbclk() +*/ +ulong ticks2usec (unsigned long ticks); +#endif /* _TIME_H */
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 18/41 common: Move some time functions out of common.h
Quoted 3 lines · Simon Glass
These functions belong in
time.hso move them over and add comments.Signed-off-by Simon Glass <[email protected]>
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/4fb2ff66/attachment.sig>
PATCH v2 19/41 common: Move wait_ticks functions out of common.h
In reply to Simon GlassThis function belongs in time.h so move it over and add a comment.
---
Changes in v2: None
arch/arm/cpu/pxa/pxa2xx.c | 1 + drivers/timer/mpc83xx_timer.c | 1 + include/common.h | 1 - include/time.h | 9 +++++++++ 4 files changed, 11 insertions(+), 1 deletion(-)
arch/arm/cpu/pxa/pxa2xx.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <time.h> #include <asm/arch/pxa-regs.h> #include <asm/io.h> #include <asm/system.h>
drivers/timer/mpc83xx_timer.c +1 -0
@@ -9,6 +9,7 @@#include <clk.h> #include <dm.h> #include <status_led.h> +#include <time.h> #include <timer.h> #include <watchdog.h>
include/common.h +0 -1
@@ -286,7 +286,6 @@ int cleanup_before_linux_select(int flags);/* arch/$(ARCH)/lib/ticks.S */ uint64_t get_ticks (void ); -void wait_ticks (unsigned long );/* lib/uuid.c */ #include <uuid.h>
include/time.h +9 -0
@@ -86,4 +86,13 @@ ulong usec2ticks(unsigned long usec);*/ ulong ticks2usec (unsigned long ticks); +/** +* wait_ticks() - waits a given number of ticks +* +* This is an internal funciton. Normally you should use udelay() or mdelay() +* +* @ticks: Number of ticks to wait +*/ +void wait_ticks (unsigned long ticks); +#endif /* _TIME_H */
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 19/41 common: Move wait_ticks functions out of common.h
Quoted 57 lines · Simon Glass
This function belongs in
time.hso move it over and add a comment.Signed-off-by Simon Glass <[email protected]>---
Changes in v2: None
arch/arm/cpu/pxa/pxa2xx.c | 1 + drivers/timer/mpc83xx_timer.c | 1 + include/common.h | 1 - include/time.h | 9 +++++++++ 4 files changed, 11 insertions(+), 1 deletion(-)arch/arm/cpu/pxa/pxa2xx.c +1
-0@@ -10,6 +10,7 @@*/ #include <common.h> +#include <time.h> #include <asm/arch/pxa-regs.h> #include <asm/io.h> #include <asm/system.h> drivers/timer/mpc83xx_timer.c +1
-0@@ -9,6 +9,7 @@#include <clk.h> #include <dm.h> #include <status_led.h> +#include <time.h> #include <timer.h> #include <watchdog.h> include/common.h +0
-1@@ -286,7 +286,6 @@ int cleanup_before_linux_select(int flags);/* arch/$(ARCH)/lib/ticks.S */ uint64_t get_ticks (void ); -void wait_ticks (unsigned long );/* lib/uuid.c */ #include <uuid.h> include/time.h +0
-0@@ -86,4 +86,13 @@ ulong usec2ticks(unsigned long usec);*/ ulong ticks2usec (unsigned long ticks);
include/time.h ulong usec2ticks(unsigned long usec); · line 98
Quoted 10 lines
include/time.h +9
-0+/** +* wait_ticks() - waits a given number of ticks +* +* This is an internal funciton. Normally you should use udelay() or mdelay() +* +* @ticks: Number of ticks to wait +*/ +void wait_ticks (unsigned long ticks); +#endif /* _TIME_H */
OK, so pxa has "pxa_wait_ticks" not "wait_ticks", so maybe you need to check your scripts and re-run the series to catch any other similar cases? As an aside, pxa_wait_ticks should be static inline'd and since it's a one-time-use function perhaps just moved in to the caller.
Next, wait_ticks exists on m68k but is unused and could be dropped. But in this case I see it's guarded on CONFIG_MCFPIT which is unset, so I'll follow up and clean that all out.
Which brings us to PowerPC, where we have the asm version (as implied by the common.h comment) and then mpc83xx has a specific timer driver that provides it, and then wait_ticks is used to implement udelay on PowerPC so perhaps the comment should read more like:
"This is an internal function typically used to implement udelay() and similar".
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/5691abef/attachment.sig>
PATCH v2 20/41 common: Move timer_get_us() function out of common.h
In reply to Simon GlassThis function belongs in time.h so move it over and update the comment style.
---
Changes in v2: None
include/common.h | 3 --- include/time.h | 7 +++++++ 2 files changed, 7 insertions(+), 3 deletions(-)
include/common.h +0 -3
@@ -251,9 +251,6 @@ void irq_install_handler(int, interrupt_handler_t *, void *);void irq_free_handler (int );void reset_timer (void ); -/* Return value of monotonic microsecond timer */ -unsigned long timer_get_us (void ); -void enable_interrupts (void );int disable_interrupts (void );
include/time.h +7 -0
@@ -95,4 +95,11 @@ ulong ticks2usec(unsigned long ticks);*/ void wait_ticks (unsigned long ticks); +/** +* timer_get_us() - Get monotonic microsecond timer +* +* @return value of monotonic microsecond timer +*/ +unsigned long timer_get_us (void ); +#endif /* _TIME_H */
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 20/41 common: Move timer_get_us() function out of common.h
Quoted 4 lines · Simon Glass
This function belongs in
time.hso move it over and update the comment style.Signed-off-by Simon Glass <[email protected]>
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/dd52b263/attachment.sig>
PATCH v2 21/41 common: Move get_ticks() function out of common.h
In reply to Simon GlassThis function belongs in time.h so move it over and add a comment.
---
Changes in v2: None
arch/arm/cpu/arm920t/ep93xx/timer.c | 1 + arch/arm/cpu/arm920t/imx/timer.c | 1 + arch/arm/cpu/arm926ejs/armada100/timer.c | 1 + arch/arm/cpu/arm926ejs/lpc32xx/timer.c | 1 + arch/arm/cpu/arm926ejs/mx27/timer.c | 1 + arch/arm/cpu/arm926ejs/mxs/timer.c | 1 + arch/arm/cpu/arm926ejs/spear/timer.c | 1 + arch/arm/cpu/armv7/arch_timer.c | 1 + arch/arm/cpu/armv7/iproc-common/timer.c | 1 + arch/arm/cpu/armv7/s5p-common/timer.c | 1 + arch/arm/cpu/armv7/stv0991/timer.c | 1 + arch/arm/cpu/armv7/sunxi/timer.c | 1 + arch/arm/cpu/armv7/vf610/timer.c | 1 + arch/arm/cpu/armv7m/systick-timer.c | 1 + arch/arm/cpu/sa1100/timer.c | 1 + arch/arm/mach-at91/arm920t/timer.c | 1 + arch/arm/mach-davinci/timer.c | 1 + arch/arm/mach-omap2/timer.c | 1 + arch/arm/mach-orion5x/timer.c | 1 + arch/arm/mach-rmobile/timer.c | 1 + arch/arm/mach-socfpga/clock_manager_gen5.c | 1 + arch/arm/mach-sunxi/dram_helpers.c | 1 + arch/arm/mach-sunxi/p2wi.c | 1 + arch/arm/mach-sunxi/rsb.c | 1 + arch/arm/mach-tegra/clock.c | 1 + arch/microblaze/cpu/timer.c | 1 + arch/mips/mach-jz47xx/jz4780/timer.c | 1 + arch/nds32/cpu/n1213/ag101/timer.c | 1 + arch/sh/lib/time_sh2.c | 1 + arch/xtensa/lib/time.c | 1 + board/armltd/integrator/timer.c | 1 + board/broadcom/bcmstb/bcmstb.c | 1 + board/xilinx/versal/board.c | 1 + common/autoboot.c | 1 + common/bootretry.c | 1 + common/cli_readline.c | 1 + common/iotrace.c | 1 + drivers/clk/clk_stm32mp1.c | 1 + drivers/mailbox/mailbox-uclass.c | 1 + drivers/misc/tegra186_bpmp.c | 1 + drivers/mmc/bcm2835_sdhci.c | 1 + drivers/mmc/mxcmmc.c | 1 + drivers/net/pic32_eth.c | 1 + drivers/nvme/nvme.c | 1 + drivers/power/pmic/stpmic1.c | 1 + drivers/sound/broadwell_i2s.c | 1 + drivers/spi/ath79_spi.c | 1 + drivers/spi/exynos_spi.c | 1 + drivers/spi/rk_spi.c | 1 + drivers/spi/tegra114_spi.c | 1 + drivers/spi/tegra20_sflash.c | 1 + drivers/spi/tegra20_slink.c | 1 + drivers/spi/tegra210_qspi.c | 1 + drivers/spi/uniphier_spi.c | 1 + drivers/spi/zynq_spi.c | 1 + drivers/timer/tsc_timer.c | 1 + drivers/video/sunxi/sunxi_display.c | 1 + drivers/video/sunxi/sunxi_dw_hdmi.c | 1 + include/common.h | 7 ++----- include/time.h | 10 ++++++++++ lib/efi_loader/efi_boottime.c | 1 + lib/efi_loader/efi_console.c | 1 + lib/time.c | 1 + lib/trace.c | 1 + lib/uuid.c | 1 + net/nfs.c | 1 + post/post.c | 1 + test/time_ut.c | 1 + 68 files changed, 78 insertions(+), 5 deletions(-)
arch/arm/cpu/arm920t/ep93xx/timer.c +1 -0
@@ -12,6 +12,7 @@*/ #include <common.h> +#include <time.h> #include <linux/types.h> #include <asm/arch/ep93xx.h> #include <asm/io.h>
arch/arm/cpu/arm920t/imx/timer.c +1 -0
@@ -13,6 +13,7 @@*/ #include <common.h> +#include <time.h> #if defined (CONFIG_IMX )#include <asm/arch/imx-regs.h>
arch/arm/cpu/arm926ejs/armada100/timer.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <time.h> #include <asm/arch/cpu.h> #include <asm/arch/armada100.h>
arch/arm/cpu/arm926ejs/lpc32xx/timer.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <time.h> #include <asm/arch/cpu.h> #include <asm/arch/clk.h> #include <asm/arch/timer.h>
arch/arm/cpu/arm926ejs/mx27/timer.c +1 -0
@@ -17,6 +17,7 @@#include <common.h> #include <div64.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/imx-regs.h>
arch/arm/cpu/arm926ejs/mxs/timer.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/sys_proto.h>
arch/arm/cpu/arm926ejs/spear/timer.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/hardware.h> #include <asm/arch/spr_gpt.h>
arch/arm/cpu/armv7/arch_timer.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <time.h> #include <asm/io.h> #include <div64.h> #include <bootstage.h>
arch/arm/cpu/armv7/iproc-common/timer.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <div64.h> +#include <time.h> #include <asm/io.h> #include <asm/iproc-common/timer.h> #include <asm/iproc-common/sysmap.h>
arch/arm/cpu/armv7/s5p-common/timer.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <div64.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/pwm.h> #include <asm/arch/clk.h>
arch/arm/cpu/armv7/stv0991/timer.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <time.h> #include <asm/io.h> #include <asm/arch-stv0991/hardware.h> #include <asm/arch-stv0991/stv0991_cgu.h>
arch/arm/cpu/armv7/sunxi/timer.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/timer.h>
arch/arm/cpu/armv7/vf610/timer.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <time.h> #include <asm/io.h> #include <div64.h> #include <asm/arch/imx-regs.h>
arch/arm/cpu/armv7m/systick-timer.c +1 -0
@@ -22,6 +22,7 @@*/ #include <common.h> +#include <time.h> #include <asm/io.h> DECLARE_GLOBAL_DATA_PTR ;
arch/arm/cpu/sa1100/timer.c +1 -0
@@ -11,6 +11,7 @@#include <common.h> #include <SA-1100.h> +#include <time.h> static ulong get_timer_masked (void ) {
arch/arm/mach-at91/arm920t/timer.c +1 -0
@@ -14,6 +14,7 @@*/ #include <common.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/hardware.h>
arch/arm/mach-davinci/timer.c +1 -0
@@ -21,6 +21,7 @@*/ #include <common.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/timer_defs.h> #include <div64.h>
arch/arm/mach-omap2/timer.c +1 -0
@@ -16,6 +16,7 @@*/ #include <common.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/cpu.h> #include <asm/arch/clock.h>
arch/arm/mach-orion5x/timer.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <time.h> #include <asm/io.h> #define UBOOT_CNTR 0/* counter to use for uboot timer */
arch/arm/mach-rmobile/timer.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <div64.h> +#include <time.h> #include <asm/io.h> #include <asm/arch-armv7/globaltimer.h> #include <asm/arch/rmobile.h>
arch/arm/mach-socfpga/clock_manager_gen5.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <time.h> #include <asm/io.h> #include <dm.h> #include <asm/arch/clock_manager.h>
arch/arm/mach-sunxi/dram_helpers.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <time.h> #include <asm/barriers.h> #include <asm/io.h> #include <asm/arch/dram.h>
arch/arm/mach-sunxi/p2wi.c +1 -0
@@ -15,6 +15,7 @@#include <common.h> #include <errno.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/cpu.h> #include <asm/arch/gpio.h>
arch/arm/mach-sunxi/rsb.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <errno.h> +#include <time.h> #include <asm/arch/cpu.h> #include <asm/arch/gpio.h> #include <asm/arch/prcm.h>
arch/arm/mach-tegra/clock.c +1 -0
@@ -9,6 +9,7 @@#include <div64.h> #include <dm.h> #include <errno.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch/tegra.h>
arch/microblaze/cpu/timer.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <fdtdec.h> +#include <time.h> #include <asm/microblaze_timer.h> #include <asm/microblaze_intc.h>
arch/mips/mach-jz47xx/jz4780/timer.c +1 -0
@@ -9,6 +9,7 @@#include <config.h> #include <common.h> #include <div64.h> +#include <time.h> #include <asm/io.h> #include <asm/mipsregs.h> #include <mach/jz4780.h>
arch/nds32/cpu/n1213/ag101/timer.c +1 -0
@@ -9,6 +9,7 @@*/ #ifndef CONFIG_TIMER #include <common.h> +#include <time.h> #include <asm/io.h> #include <faraday/fttmr010.h>
arch/sh/lib/time_sh2.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <time.h> #include <asm/io.h> #include <asm/processor.h>
arch/xtensa/lib/time.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <time.h> #include <asm/global_data.h> #include <linux/stringify.h>
board/armltd/integrator/timer.c +1 -0
@@ -18,6 +18,7 @@#include <common.h> #include <div64.h> +#include <time.h> #ifdef CONFIG_ARCH_CINTEGRATOR #define DIV_CLOCK_INIT 1
board/broadcom/bcmstb/bcmstb.c +1 -0
@@ -6,6 +6,7 @@* Author: Thomas Fitzsimmons <[email protected]> */ +#include <time.h> #include <linux/types.h> #include <common.h> #include <env.h>
board/xilinx/versal/board.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <fdtdec.h> #include <malloc.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/hardware.h> #include <asm/arch/sys_proto.h>
common/autoboot.c +1 -0
@@ -15,6 +15,7 @@#include <memalign.h> #include <menu.h> #include <post.h> +#include <time.h> #include <u-boot/sha256.h> #include <bootcount.h>
common/bootretry.c +1 -0
@@ -9,6 +9,7 @@#include <cli.h> #include <env.h> #include <errno.h> +#include <time.h> #include <watchdog.h> #ifndef CONFIG_BOOT_RETRY_MIN
common/cli_readline.c +1 -0
@@ -11,6 +11,7 @@#include <common.h> #include <bootretry.h> #include <cli.h> +#include <time.h> #include <watchdog.h> DECLARE_GLOBAL_DATA_PTR ;
common/iotrace.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <mapmem.h> +#include <time.h> #include <asm/io.h> #include <u-boot/crc.h>
drivers/clk/clk_stm32mp1.c +1 -0
@@ -10,6 +10,7 @@#include <regmap.h> #include <spl.h> #include <syscon.h> +#include <time.h> #include <vsprintf.h> #include <linux/io.h> #include <linux/iopoll.h>
drivers/mailbox/mailbox-uclass.c +1 -0
@@ -7,6 +7,7 @@#include <dm.h> #include <mailbox.h> #include <mailbox-uclass.h> +#include <time.h> static inline struct mbox_ops *mbox_dev_ops (struct udevice *dev) {
drivers/misc/tegra186_bpmp.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <dm.h> +#include <time.h> #include <dm/lists.h> #include <dm/root.h> #include <mailbox.h>
drivers/mmc/bcm2835_sdhci.c +1 -0
@@ -41,6 +41,7 @@#include <malloc.h> #include <memalign.h> #include <sdhci.h> +#include <time.h> #include <asm/arch/msg.h> #include <asm/arch/mbox.h> #include <mach/sdhci.h>
drivers/mmc/mxcmmc.c +1 -0
@@ -23,6 +23,7 @@#include <part.h> #include <malloc.h> #include <mmc.h> +#include <time.h> #include <linux/errno.h> #include <asm/io.h> #include <asm/arch/clock.h>
drivers/net/pic32_eth.c +1 -0
@@ -9,6 +9,7 @@#include <net.h> #include <miiphy.h> #include <console.h> +#include <time.h> #include <wait_bit.h> #include <asm/gpio.h>
drivers/nvme/nvme.c +1 -0
@@ -9,6 +9,7 @@#include <errno.h> #include <memalign.h> #include <pci.h> +#include <time.h> #include <dm/device-internal.h> #include "nvme.h"
drivers/power/pmic/stpmic1.c +1 -0
@@ -9,6 +9,7 @@#include <i2c.h> #include <misc.h> #include <sysreset.h> +#include <time.h> #include <dm/device.h> #include <dm/lists.h> #include <power/pmic.h>
drivers/sound/broadwell_i2s.c +1 -0
@@ -12,6 +12,7 @@#include <common.h> #include <dm.h> #include <i2s.h> +#include <time.h> #include <asm/io.h> #include "broadwell_i2s.h"
drivers/spi/ath79_spi.c +1 -0
@@ -8,6 +8,7 @@#include <dm.h> #include <div64.h> #include <errno.h> +#include <time.h> #include <asm/io.h> #include <asm/addrspace.h> #include <asm/types.h>
drivers/spi/exynos_spi.c +1 -0
@@ -10,6 +10,7 @@#include <malloc.h> #include <spi.h> #include <fdtdec.h> +#include <time.h> #include <asm/arch/clk.h> #include <asm/arch/clock.h> #include <asm/arch/cpu.h>
drivers/spi/rk_spi.c +1 -0
@@ -16,6 +16,7 @@#include <dt-structs.h> #include <errno.h> #include <spi.h> +#include <time.h> #include <linux/errno.h> #include <asm/io.h> #include <asm/arch-rockchip/clock.h>
drivers/spi/tegra114_spi.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <dm.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch-tegra/clk_rst.h>
drivers/spi/tegra20_sflash.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <dm.h> #include <errno.h> +#include <time.h> #include <asm/io.h> #include <asm/gpio.h> #include <asm/arch/clock.h>
drivers/spi/tegra20_slink.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <dm.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch-tegra/clk_rst.h>
drivers/spi/tegra210_qspi.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <dm.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch-tegra/clk_rst.h>
drivers/spi/uniphier_spi.c +1 -0
@@ -7,6 +7,7 @@#include <clk.h> #include <common.h> #include <dm.h> +#include <time.h> #include <linux/bitfield.h> #include <linux/io.h> #include <spi.h>
drivers/spi/zynq_spi.c +1 -0
@@ -10,6 +10,7 @@#include <dm.h> #include <malloc.h> #include <spi.h> +#include <time.h> #include <asm/io.h> DECLARE_GLOBAL_DATA_PTR ;
drivers/timer/tsc_timer.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <dm.h> #include <malloc.h> +#include <time.h> #include <timer.h> #include <asm/cpu.h> #include <asm/io.h>
drivers/video/sunxi/sunxi_display.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <efi_loader.h> +#include <time.h> #include <asm/arch/clock.h> #include <asm/arch/display.h>
drivers/video/sunxi/sunxi_dw_hdmi.c +1 -0
@@ -10,6 +10,7 @@#include <dm.h> #include <dw_hdmi.h> #include <edid.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch/lcdc.h>
include/common.h +2 -5
@@ -3,8 +3,8 @@* Common header file for U-Boot * * This file still includes quite a bit of stuff that should be in separate -* headers like command.h, cpu.h and timer.h. Please think before adding more -* things. Patches to remove things are welcome. +* headers like command.h and cpu.h. Please think before adding more things. +* Patches to remove things are welcome. * * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
@@ -281,9 +281,6 @@ enum {*/ int cleanup_before_linux_select (int flags); -/* arch/$(ARCH)/lib/ticks.S */ -uint64_t get_ticks (void ); -/* lib/uuid.c */ #include <uuid.h>
include/time.h +10 -0
@@ -102,4 +102,14 @@ void wait_ticks(unsigned long ticks);*/ unsigned long timer_get_us (void ); +/** +* get_ticks() - Get the current tick value +* +* This is an internal value used by the timer on the system. Ticks increase +* monotonically at the rate given by get_tbclk(). +* +* @return current tick value +*/ +uint64_t get_ticks (void ); +#endif /* _TIME_H */
lib/efi_loader/efi_boottime.c +1 -0
@@ -9,6 +9,7 @@#include <div64.h> #include <efi_loader.h> #include <malloc.h> +#include <time.h> #include <linux/libfdt_env.h> #include <u-boot/crc.h> #include <bootm.h>
lib/efi_loader/efi_console.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <charset.h> +#include <time.h> #include <dm/device.h> #include <efi_loader.h> #include <env.h>
lib/time.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <dm.h> #include <errno.h> +#include <time.h> #include <timer.h> #include <watchdog.h> #include <div64.h>
lib/trace.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <mapmem.h> +#include <time.h> #include <trace.h> #include <asm/io.h> #include <asm/sections.h>
lib/uuid.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <env.h> +#include <time.h> #include <linux/ctype.h> #include <errno.h> #include <common.h>
net/nfs.c +1 -0
@@ -33,6 +33,7 @@#include <mapmem.h> #include "nfs.h" #include "bootp.h" +#include <time.h> #define HASHES_PER_LINE 65/* Number of "loading" hashes per line */ #define NFS_RETRY_COUNT 30
post/post.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <env.h> #include <stdio_dev.h> +#include <time.h> #include <watchdog.h> #include <div64.h> #include <post.h>
test/time_ut.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <command.h> #include <errno.h> +#include <time.h> static int test_get_timer (void ) {
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 21/41 common: Move get_ticks() function out of common.h
Quoted 3 lines · Simon Glass
This function belongs in
time.hso move it over and add a comment.Signed-off-by Simon Glass <[email protected]>
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/9e111617/attachment.sig>
PATCH v2 22/41 common: Move mii_init() function out of common.h
In reply to Simon GlassThis function belongs in mii.h so move it over.
---
Changes in v2: None
arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 1 + drivers/net/fsl_mcdmafec.c | 1 + drivers/net/ldpaa_eth/ls1088a.c | 1 + drivers/net/ldpaa_eth/lx2160a.c | 1 + drivers/net/mcffec.c | 1 + drivers/net/mcfmii.c | 1 + drivers/net/mpc8xx_fec.c | 1 + drivers/net/pic32_eth.c | 1 + include/common.h | 3 --- include/linux/mii.h | 2 ++ 10 files changed, 10 insertions(+), 3 deletions(-)
arch/arm/cpu/armv8/fsl-layerscape/cpu.c +1 -0
@@ -39,6 +39,7 @@#include <fsl_validate.h> #endif #endif +#include <linux/mii.h> DECLARE_GLOBAL_DATA_PTR ;
drivers/net/fsl_mcdmafec.c +1 -0
@@ -14,6 +14,7 @@#include <config.h> #include <net.h> #include <miiphy.h> +#include <linux/mii.h> #undef ET_DEBUG#undef MII_DEBUG
drivers/net/ldpaa_eth/ls1088a.c +1 -0
@@ -8,6 +8,7 @@#include <asm/io.h> #include <asm/arch/fsl_serdes.h> #include <asm/arch/soc.h> +#include <linux/mii.h> u32 dpmac_to_devdisr[] = { [WRIOP1_DPMAC1 ] =FSL_CHASSIS3_DEVDISR2_DPMAC1 ,
drivers/net/ldpaa_eth/lx2160a.c +1 -0
@@ -8,6 +8,7 @@#include <asm/io.h> #include <asm/arch/fsl_serdes.h> #include <asm/arch/soc.h> +#include <linux/mii.h> u32 dpmac_to_devdisr[] = { [WRIOP1_DPMAC1 ] =FSL_CHASSIS3_DEVDISR2_DPMAC1 ,
drivers/net/mcffec.c +1 -0
@@ -18,6 +18,7 @@#include <asm/fec.h> #include <asm/immap.h> +#include <linux/mii.h> #undef ET_DEBUG#undef MII_DEBUG
drivers/net/mcfmii.c +1 -0
@@ -15,6 +15,7 @@#include <asm/fec.h> #endif #include <asm/immap.h> +#include <linux/mii.h> DECLARE_GLOBAL_DATA_PTR ;
drivers/net/mpc8xx_fec.c +1 -0
@@ -13,6 +13,7 @@#include <asm/io.h> #include <phy.h> +#include <linux/mii.h> DECLARE_GLOBAL_DATA_PTR ;
drivers/net/pic32_eth.c +1 -0
@@ -12,6 +12,7 @@#include <time.h> #include <wait_bit.h> #include <asm/gpio.h> +#include <linux/mii.h> #include "pic32_eth.h"
include/common.h +0 -3
@@ -254,9 +254,6 @@ void reset_timer (void);void enable_interrupts (void );int disable_interrupts (void ); -/* $(CPU)/.../<eth> */ -void mii_init (void ); -/* arch/$(ARCH)/lib/cache.c */ void enable_caches (void );void flush_cache (unsigned long ,unsigned long );
include/linux/mii.h +2 -0
@@ -225,4 +225,6 @@ static inline u8 mii_resolve_flowctrl_fdx(u16 lcladv, u16 rmtadv) return cap; } +void mii_init (void ); +#endif /* __LINUX_MII_H__ */
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 22/41 common: Move mii_init() function out of common.h
Quoted 3 lines · Simon Glass
This function belongs in
mii.hso move it over.Signed-off-by Simon Glass <[email protected]>
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/51a78108/attachment.sig>
PATCH v2 23/41 common: Move some CPU functions out of common.h
In reply to Simon GlassThese functions belong in cpu_legacy.h since they do not use driver model. Move them over. Don't bother adding comments since these functions should be deleted.
---
Changes in v2: None
arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 1 + .../armv8/fsl-layerscape/fsl_lsch2_speed.c | 1 + .../armv8/fsl-layerscape/fsl_lsch3_speed.c | 1 + arch/arm/cpu/armv8/s32v234/cpu.c | 1 + arch/powerpc/cpu/mpc85xx/speed.c | 1 + arch/powerpc/cpu/mpc86xx/cpu.c | 1 + arch/powerpc/cpu/mpc8xxx/cpu.c | 1 + arch/powerpc/cpu/mpc8xxx/fdt.c | 1 + board/freescale/qemu-ppce500/qemu-ppce500.c | 1 + include/common.h | 20 ------------------- include/cpu_legacy.h | 19 ++++++++++++++++++ 11 files changed, 28 insertions(+), 20 deletions(-)
arch/arm/cpu/armv8/fsl-layerscape/cpu.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <env.h> #include <fsl_ddr_sdram.h> #include <vsprintf.h>
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <linux/compiler.h> #include <asm/io.h> #include <asm/processor.h>
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <linux/compiler.h> #include <fsl_ifc.h> #include <asm/processor.h>
arch/arm/cpu/armv8/s32v234/cpu.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/system.h> #include <asm/armv8/mmu.h>
arch/powerpc/cpu/mpc85xx/speed.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <ppc_asm.tmpl> #include <linux/compiler.h> #include <asm/processor.h>
arch/powerpc/cpu/mpc86xx/cpu.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <vsprintf.h> #include <watchdog.h> #include <command.h>
arch/powerpc/cpu/mpc8xxx/cpu.c +1 -0
@@ -10,6 +10,7 @@#include <config.h> #include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <tsec.h> #include <fm_eth.h> #include <netdev.h>
arch/powerpc/cpu/mpc8xxx/fdt.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <linux/libfdt.h> #include <fdt_support.h> #include <asm/mp.h>
board/freescale/qemu-ppce500/qemu-ppce500.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <env.h> #include <pci.h> #include <asm/processor.h>
include/common.h +0 -20
@@ -203,26 +203,6 @@ void relocate_code(ulong, gd_t *, ulong) __attribute__ ((noreturn));ulong get_endaddr (void );void trap_init (ulong ); -/* $(CPU)/cpu.c */ -static inline int cpumask_next (int cpu,unsigned int mask) -{ -for (cpu++; !((1 << cpu) & mask); cpu++) - ; - -return cpu; -} - -#define for_each_cpu (iter, cpu, num_cpus, mask) \ - for (iter = 0, cpu = cpumask_next(-1, mask); \ - iter < num_cpus; \ - iter++, cpu = cpumask_next(cpu, mask)) \ - -int cpu_numcores (void ); -int cpu_num_dspcores (void ); -u32 cpu_mask (void ); -u32 cpu_dsp_mask (void ); -int is_core_valid (unsigned int ); -void s_init (void );int checkcpu (void );
include/cpu_legacy.h +19 -0
@@ -20,4 +20,23 @@ int cpu_reset(u32 nr);int cpu_disable (u32 nr);int cpu_release (u32 nr,int argc,char *const argv[]); +static inline int cpumask_next (int cpu,unsigned int mask) +{ +for (cpu++; !((1 << cpu) & mask); cpu++) + ; + +return cpu; +} + +#define for_each_cpu (iter, cpu, num_cpus, mask) \ + for (iter = 0, cpu = cpumask_next(-1, mask); \ + iter < num_cpus; \ + iter++, cpu = cpumask_next(cpu, mask)) \ + +int cpu_numcores (void ); +int cpu_num_dspcores (void ); +u32 cpu_mask (void ); +u32 cpu_dsp_mask (void ); +int is_core_valid (unsigned int core); +#endif
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 24/41 common: Drop cpu_init()
In reply to Simon GlassThis function is not defined anywhere. Drop it.
---
Changes in v2: None
include/common.h | 2 -- 1 file changed, 2 deletions(-)
include/common.h +0 -2
@@ -64,8 +64,6 @@ typedef void (interrupt_handler_t)(void *);*/ void hang (void ) __attribute__ ((noreturn)); -int cpu_init (void ); -#include <display_options.h> /* common/main.c */
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 24/41 common: Drop cpu_init()
Quoted 3 lines · Simon Glass
This function is not defined anywhere. Drop it.
Signed-off-by Simon Glass <[email protected]>
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/94f6d873/attachment.sig>
PATCH v2 25/41 common: Move checkcpu() out of common.h
In reply to Simon GlassThis function belongs in cpu.h so move it over.
---
Changes in v2: None
arch/powerpc/cpu/mpc83xx/cpu.c | 1 + arch/powerpc/cpu/mpc8xx/cpu.c | 1 + arch/sh/cpu/sh4/cpu.c | 1 + arch/x86/cpu/broadwell/cpu_from_spl.c | 1 + arch/x86/cpu/coreboot/coreboot.c | 1 + arch/x86/cpu/efi/app.c | 1 + arch/x86/cpu/efi/payload.c | 1 + arch/x86/cpu/ivybridge/cpu.c | 1 + arch/x86/cpu/qemu/qemu.c | 1 + arch/x86/cpu/quark/quark.c | 1 + arch/x86/cpu/slimbootloader/slimbootloader.c | 1 + arch/x86/cpu/tangier/tangier.c | 1 + arch/x86/cpu/x86_64/cpu.c | 1 + arch/x86/lib/fsp/fsp_common.c | 1 + common/board_f.c | 1 + include/common.h | 1 - include/cpu_legacy.h | 10 ++++++++++ 17 files changed, 25 insertions(+), 1 deletion(-)
arch/powerpc/cpu/mpc83xx/cpu.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <cpu.h> #include <vsprintf.h> #include <watchdog.h> #include <command.h>
arch/powerpc/cpu/mpc8xx/cpu.c +1 -0
@@ -17,6 +17,7 @@*/ #include <common.h> +#include <cpu.h> #include <vsprintf.h> #include <watchdog.h> #include <command.h>
arch/sh/cpu/sh4/cpu.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> +#include <cpu.h> #include <netdev.h> #include <asm/processor.h>
arch/x86/cpu/broadwell/cpu_from_spl.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <bloblist.h> +#include <cpu.h> #include <debug_uart.h> #include <handoff.h> #include <asm/mtrr.h>
arch/x86/cpu/coreboot/coreboot.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu.h> #include <fdtdec.h> #include <usb.h> #include <asm/io.h>
arch/x86/cpu/efi/app.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu.h> #include <fdtdec.h> #include <netdev.h>
arch/x86/cpu/efi/payload.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu.h> #include <efi.h> #include <errno.h> #include <usb.h>
arch/x86/cpu/ivybridge/cpu.c +1 -0
@@ -11,6 +11,7 @@*/ #include <common.h> +#include <cpu.h> #include <dm.h> #include <errno.h> #include <fdtdec.h>
arch/x86/cpu/qemu/qemu.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu.h> #include <pci.h> #include <qfw.h> #include <asm/irq.h>
arch/x86/cpu/quark/quark.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu.h> #include <mmc.h> #include <asm/io.h> #include <asm/ioapic.h>
arch/x86/cpu/slimbootloader/slimbootloader.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu.h> #include <asm/arch/slimbootloader.h> DECLARE_GLOBAL_DATA_PTR ;
arch/x86/cpu/tangier/tangier.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu.h> #include <asm/u-boot-x86.h> /*
arch/x86/cpu/x86_64/cpu.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu.h> #include <debug_uart.h> /*
arch/x86/lib/fsp/fsp_common.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <acpi_s3.h> +#include <cpu.h> #include <dm.h> #include <errno.h> #include <rtc.h>
common/board_f.c +1 -0
@@ -13,6 +13,7 @@#include <bloblist.h> #include <console.h> #include <cpu.h> +#include <cpu_legacy.h> #include <dm.h> #include <env.h> #include <env_internal.h>
include/common.h +0 -1
@@ -203,7 +203,6 @@ void trap_init (ulong);void s_init (void ); -int checkcpu (void );int checkicache (void );int checkdcache (void );void upmconfig (unsigned int ,unsigned int *,unsigned int );
include/cpu_legacy.h +10 -0
@@ -39,4 +39,14 @@ u32 cpu_mask(void);u32 cpu_dsp_mask (void );int is_core_valid (unsigned int core); +/** +* checkcpu() - perform an early check of the CPU +* +* This is used on PowerPC, SH and X86 machines as a CPU init mechanism. It is +* called during the pre-relocation init sequence in board_init_f(). +* +* @return 0 if oK, -ve on error +*/ +int checkcpu (void ); +#endif
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 25/41 common: Move checkcpu() out of common.h
Quoted 3 lines · Simon Glass
This function belongs in
cpu.hso move it over.Signed-off-by Simon Glass <[email protected]>
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/488171b5/attachment.sig>
PATCH v2 26/41 common: Move some SMP functions out of common.h
In reply to Simon GlassThese functions belong in cpu_legacy.h so move them over.
---
Changes in v2: None
arch/arm/cpu/armv7/ls102xa/cpu.c | 1 + arch/arm/cpu/armv7/virt-v7.c | 1 + arch/arm/lib/bootm.c | 1 + arch/arm/mach-uniphier/arm32/psci.c | 1 + board/armltd/vexpress/vexpress_common.c | 1 + board/broadcom/bcm_ep/board.c | 1 + board/samsung/arndale/arndale.c | 1 + board/synopsys/axs10x/axs10x.c | 1 + board/xilinx/zynqmp/zynqmp.c | 1 + cmd/elf.c | 1 + include/common.h | 3 --- include/cpu_legacy.h | 3 +++ 12 files changed, 13 insertions(+), 3 deletions(-)
arch/arm/cpu/armv7/ls102xa/cpu.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <vsprintf.h> #include <asm/arch/clock.h> #include <asm/io.h>
arch/arm/cpu/armv7/virt-v7.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/armv7.h> #include <asm/gic.h> #include <asm/io.h>
arch/arm/lib/bootm.c +1 -0
@@ -13,6 +13,7 @@#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <dm.h> #include <dm/root.h> #include <env.h>
arch/arm/mach-uniphier/arm32/psci.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <linux/bitops.h> #include <linux/delay.h> #include <linux/io.h>
board/armltd/vexpress/vexpress_common.c +1 -0
@@ -16,6 +16,7 @@* Philippe Robin, <[email protected]> */ #include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <errno.h> #include <netdev.h>
board/broadcom/bcm_ep/board.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <config.h> #include <netdev.h>
board/samsung/arndale/arndale.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <usb.h> #include <asm/gpio.h> #include <asm/arch/pinmux.h>
board/synopsys/axs10x/axs10x.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dwmmc.h> #include <malloc.h> #include <asm/arcregs.h>
board/xilinx/zynqmp/zynqmp.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <env.h> #include <sata.h> #include <ahci.h>
cmd/elf.c +1 -0
@@ -15,6 +15,7 @@#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <elf.h> #include <env.h> #include <net.h>
include/common.h +0 -3
@@ -212,9 +212,6 @@ void reset_cpu (ulong addr);void ft_cpu_setup (void *blob,bd_t *bd);void ft_pci_setup (void *blob,bd_t *bd); -void smp_set_core_boot_addr (unsigned long addr,int corenr); -void smp_kick_all_cpus (void ); -/* $(CPU)/speed.c */ int get_clocks (void );ulong get_bus_freq (ulong );
include/cpu_legacy.h +3 -0
@@ -49,4 +49,7 @@ int is_core_valid(unsigned int core);*/ int checkcpu (void ); +void smp_set_core_boot_addr (unsigned long addr,int corenr); +void smp_kick_all_cpus (void ); +#endif
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 27/41 arm: powerpc: Tidy up code style for cache functions
In reply to Simon GlassRemove the unwanted space before the bracket.
---
Changes in v2: None
arch/arm/lib/cache-cp15.c | 12 ++++++------ arch/microblaze/cpu/cache.c | 18 +++++++++++------- board/armltd/integrator/integrator.c | 2 +- board/cobra5272/flash.c | 12 ++++++------ include/common.h | 2 +- post/lib_powerpc/cpu.c | 6 +++--- 6 files changed, 28 insertions(+), 24 deletions(-)
arch/arm/lib/cache-cp15.c +6 -6
@@ -247,17 +247,17 @@ static void cache_disable(uint32_t cache_bit)#endif #if CONFIG_IS_ENABLED (SYS_ICACHE_OFF ) -void icache_enable (void ) +void icache_enable (void ) {return ; } -void icache_disable (void ) +void icache_disable (void ) {return ; } -int icache_status (void ) +int icache_status (void ) {return 0 ;/* always off */ }
@@ -279,17 +279,17 @@ int icache_status(void)#endif #if CONFIG_IS_ENABLED (SYS_DCACHE_OFF ) -void dcache_enable (void ) +void dcache_enable (void ) {return ; } -void dcache_disable (void ) +void dcache_disable (void ) {return ; } -int dcache_status (void ) +int dcache_status (void ) {return 0 ;/* always off */ }
arch/microblaze/cpu/cache.c +11 -7
@@ -8,7 +8,7 @@#include <common.h> #include <asm/asm.h> -int dcache_status (void ) +int dcache_status (void ) {int i =0 ;int mask =0x80 ;
@@ -18,7 +18,7 @@ int dcache_status (void)return i; } -int icache_status (void ) +int icache_status (void ) {int i =0 ;int mask =0x20 ;
@@ -28,28 +28,32 @@ int icache_status (void)return i; } -void icache_enable (void ) { +void icache_enable (void ) +{MSRSET (0x20 ); } -void icache_disable (void ) { +void icache_disable (void ) +{/* we are not generate ICACHE size -> flush whole cache */ flush_cache (0 ,32768 );MSRCLR (0x20 ); } -void dcache_enable (void ) { +void dcache_enable (void ) +{MSRSET (0x80 ); } -void dcache_disable (void ) { +void dcache_disable (void ) +{#ifdef XILINX_USE_DCACHE flush_cache (0 ,XILINX_DCACHE_BYTE_SIZE );#endif MSRCLR (0x80 ); } -void flush_cache (ulong addr,ulong size) +void flush_cache (ulong addr,ulong size) {int i;for (i =0 ; i < size; i +=4 )
board/armltd/integrator/integrator.c +1 -1
@@ -109,7 +109,7 @@ extern void cm_remap(void);writel (SC_CTRL_FLASHVPP |SC_CTRL_FLASHWP ,SC_CTRLS );#endif -icache_enable (); +icache_enable ();return 0 ; }
board/cobra5272/flash.c +6 -6
@@ -164,8 +164,8 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)* chip is in programming mode. */ - cflag =icache_status (); -icache_disable (); + cflag =icache_status (); +icache_disable (); iflag =disable_interrupts ();printf ("\n" );
@@ -237,7 +237,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)enable_interrupts ();if (cflag) -icache_enable (); +icache_enable ();return rc; }
@@ -267,8 +267,8 @@ static int write_word (flash_info_t * info, ulong dest, ulong data)* chip is in programming mode. */ - cflag =icache_status (); -icache_disable (); + cflag =icache_status (); +icache_disable (); iflag =disable_interrupts ();MEM_FLASH_ADDR1 =CMD_UNLOCK1 ;
@@ -303,7 +303,7 @@ static int write_word (flash_info_t * info, ulong dest, ulong data)enable_interrupts ();if (cflag) -icache_enable (); +icache_enable ();return rc; }
include/common.h +1 -1
@@ -189,7 +189,7 @@ int testdram(void);int icache_status (void );void icache_enable (void );void icache_disable (void ); -int dcache_status (void ); +int dcache_status (void );void dcache_enable (void );void dcache_disable (void );void mmu_disable (void );
post/lib_powerpc/cpu.c +3 -3
@@ -57,12 +57,12 @@ ulong cpu_post_makecr (long v)int cpu_post_test (int flags) { -int ic =icache_status (); +int ic =icache_status ();int ret =0 ;WATCHDOG_RESET ();if (ic) -icache_disable (); +icache_disable ();if (ret ==0 ) ret =cpu_post_test_cmp ();
@@ -110,7 +110,7 @@ int cpu_post_test (int flags)WATCHDOG_RESET ();if (ic) -icache_enable (); +icache_enable ();WATCHDOG_RESET ();
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 27/41 arm: powerpc: Tidy up code style for cache functions
Quoted 3 lines · Simon Glass
Remove the unwanted space before the bracket.
Signed-off-by Simon Glass <[email protected]>
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/aeac0f3c/attachment.sig>
PATCH v2 28/41 common: Move some cache and MMU functions out of common.h
In reply to Simon GlassThese functions belong in cpu_legacy.h. Another option would be cache.h but that code uses driver model and we have not moved these cache functions to use driver model. Since they are CPU-related it seems reasonable to put them here.
Move them over.
---
Changes in v2: None
arch/arc/lib/cache.c | 1 + arch/arm/cpu/arm11/cpu.c | 1 + arch/arm/cpu/arm920t/cpu.c | 1 + arch/arm/cpu/arm926ejs/armada100/cpu.c | 1 + arch/arm/cpu/arm926ejs/cache.c | 1 + arch/arm/cpu/arm926ejs/cpu.c | 1 + arch/arm/cpu/arm926ejs/spear/spr_misc.c | 1 + arch/arm/cpu/arm946es/cpu.c | 1 + arch/arm/cpu/armv7/cpu.c | 1 + arch/arm/cpu/armv7/exception_level.c | 1 + arch/arm/cpu/armv7/iproc-common/hwinit-common.c | 1 + arch/arm/cpu/armv7/kona-common/hwinit-common.c | 1 + arch/arm/cpu/armv7/mpu_v7r.c | 1 + arch/arm/cpu/armv7/vf610/generic.c | 1 + arch/arm/cpu/armv7m/cache.c | 1 + arch/arm/cpu/armv7m/cpu.c | 1 + arch/arm/cpu/armv8/cache_v8.c | 1 + arch/arm/cpu/armv8/cpu.c | 1 + arch/arm/cpu/armv8/exception_level.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/spl.c | 1 + arch/arm/cpu/pxa/pxa2xx.c | 1 + arch/arm/cpu/sa1100/cpu.c | 1 + arch/arm/lib/cache-cp15.c | 1 + arch/arm/mach-at91/armv7/cpu.c | 1 + arch/arm/mach-bcm283x/init.c | 1 + arch/arm/mach-exynos/soc.c | 1 + arch/arm/mach-imx/cache.c | 1 + arch/arm/mach-imx/imx8/cpu.c | 1 + arch/arm/mach-imx/imx8m/soc.c | 1 + arch/arm/mach-imx/mx5/soc.c | 1 + arch/arm/mach-keystone/init.c | 1 + arch/arm/mach-mediatek/cpu.c | 1 + arch/arm/mach-mvebu/armada8k/cpu.c | 1 + arch/arm/mach-mvebu/cpu.c | 1 + arch/arm/mach-omap2/omap-cache.c | 1 + arch/arm/mach-orion5x/cpu.c | 1 + arch/arm/mach-rmobile/cpu_info.c | 1 + arch/arm/mach-rmobile/memmap-gen3.c | 1 + arch/arm/mach-rockchip/board.c | 1 + arch/arm/mach-s5pc1xx/cache.c | 1 + arch/arm/mach-socfpga/misc.c | 1 + arch/arm/mach-socfpga/spl_a10.c | 1 + arch/arm/mach-stm32mp/cpu.c | 1 + arch/arm/mach-sunxi/board.c | 1 + arch/arm/mach-tegra/board.c | 1 + arch/arm/mach-uniphier/arm32/cache-uniphier.c | 1 + arch/arm/mach-zynq/cpu.c | 1 + arch/m68k/cpu/mcf5227x/cpu_init.c | 1 + arch/m68k/cpu/mcf523x/cpu_init.c | 1 + arch/m68k/cpu/mcf52x2/cpu_init.c | 1 + arch/m68k/cpu/mcf530x/cpu_init.c | 1 + arch/m68k/cpu/mcf532x/cpu_init.c | 1 + arch/m68k/cpu/mcf5445x/cpu_init.c | 1 + arch/m68k/cpu/mcf547x_8x/cpu_init.c | 1 + arch/m68k/lib/cache.c | 1 + arch/microblaze/cpu/cache.c | 1 + arch/mips/lib/cache.c | 1 + arch/nds32/cpu/n1213/ae3xx/cpu.c | 1 + arch/nds32/cpu/n1213/ag101/cpu.c | 1 + arch/nds32/lib/cache.c | 1 + arch/nios2/lib/cache.c | 1 + arch/powerpc/cpu/mpc83xx/spd_sdram.c | 1 + arch/powerpc/cpu/mpc8xx/cache.c | 1 + arch/riscv/cpu/ax25/cache.c | 1 + arch/riscv/cpu/ax25/cpu.c | 1 + arch/riscv/lib/cache.c | 1 + arch/sh/cpu/sh4/cache.c | 1 + arch/x86/cpu/cpu.c | 1 + arch/x86/cpu/i386/cpu.c | 1 + arch/x86/cpu/mtrr.c | 1 + arch/x86/cpu/x86_64/cpu.c | 1 + arch/x86/lib/spl.c | 1 + arch/xtensa/lib/cache.c | 1 + board/armltd/integrator/integrator.c | 1 + board/cirrus/edb93xx/edb93xx.c | 1 + board/cobra5272/flash.c | 1 + board/highbank/highbank.c | 1 + board/st/stih410-b2260/board.c | 1 + board/synopsys/hsdk/hsdk.c | 1 + board/syteco/zmx25/zmx25.c | 1 + board/toradex/colibri_pxa270/colibri_pxa270.c | 1 + board/xilinx/zynqmp/cmds.c | 1 + cmd/cache.c | 1 + cmd/ti/ddr3.c | 1 + common/bootm_os.c | 1 + common/kgdb_stubs.c | 1 + common/spl/spl_atf.c | 1 + drivers/ddr/altera/sdram_arria10.c | 1 + drivers/ddr/altera/sdram_s10.c | 1 + drivers/fpga/zynqpl.c | 1 + drivers/video/cfb_console.c | 1 + include/common.h | 10 +--------- include/cpu_legacy.h | 8 ++++++++ post/cpu/mpc83xx/ecc.c | 1 + post/lib_powerpc/cpu.c | 1 + 95 files changed, 102 insertions(+), 9 deletions(-)
arch/arc/lib/cache.c +1 -0
@@ -5,6 +5,7 @@#include <config.h> #include <common.h> +#include <cpu_legacy.h> #include <linux/compiler.h> #include <linux/kernel.h> #include <linux/log2.h>
arch/arm/cpu/arm11/cpu.c +1 -0
@@ -16,6 +16,7 @@#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <asm/system.h> static void cache_flush (void );
arch/arm/cpu/arm920t/cpu.c +1 -0
@@ -14,6 +14,7 @@#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <asm/system.h> static void cache_flush (void );
arch/arm/cpu/arm926ejs/armada100/cpu.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/arch/cpu.h> #include <asm/arch/armada100.h>
arch/arm/cpu/arm926ejs/cache.c +1 -0
@@ -3,6 +3,7 @@* (C) Copyright 2011 * Ilya Yanok, EmCraft Systems */ +#include <cpu_legacy.h> #include <linux/types.h> #include <common.h>
arch/arm/cpu/arm926ejs/cpu.c +1 -0
@@ -14,6 +14,7 @@#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <asm/system.h> static void cache_flush (void );
arch/arm/cpu/arm926ejs/spear/spr_misc.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <env.h> #include <i2c.h> #include <net.h>
arch/arm/cpu/arm946es/cpu.c +1 -0
@@ -14,6 +14,7 @@#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <asm/system.h> #include <asm/io.h>
arch/arm/cpu/armv7/cpu.c +1 -0
@@ -16,6 +16,7 @@#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <asm/system.h> #include <asm/cache.h> #include <asm/armv7.h>
arch/arm/cpu/armv7/exception_level.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <bootm.h> +#include <cpu_legacy.h> #include <asm/armv7.h> #include <asm/secure.h> #include <asm/setjmp.h>
arch/arm/cpu/armv7/iproc-common/hwinit-common.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void enable_caches (void )
arch/arm/cpu/armv7/kona-common/hwinit-common.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <linux/sizes.h> #if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )
arch/arm/cpu/armv7/mpu_v7r.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <asm/armv7.h> #include <asm/system.h> #include <asm/barriers.h>
arch/arm/cpu/armv7/vf610/generic.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/clock.h>
arch/arm/cpu/armv7m/cache.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <errno.h> #include <asm/armv7m.h> #include <asm/io.h>
arch/arm/cpu/armv7m/cpu.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/armv7m.h>
arch/arm/cpu/armv8/cache_v8.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/system.h> #include <asm/armv8/mmu.h>
arch/arm/cpu/armv8/cpu.c +1 -0
@@ -12,6 +12,7 @@#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <asm/system.h> #include <asm/secure.h> #include <linux/compiler.h>
arch/arm/cpu/armv8/exception_level.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <bootm.h> +#include <cpu_legacy.h> #include <asm/setjmp.h> /**
arch/arm/cpu/armv8/fsl-layerscape/spl.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <env.h> #include <spl.h> #include <asm/io.h>
arch/arm/cpu/pxa/pxa2xx.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <time.h> #include <asm/arch/pxa-regs.h> #include <asm/io.h>
arch/arm/cpu/sa1100/cpu.c +1 -0
@@ -15,6 +15,7 @@#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <asm/system.h> #include <asm/io.h>
arch/arm/lib/cache-cp15.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/system.h> #include <asm/cache.h> #include <linux/compiler.h>
arch/arm/mach-at91/armv7/cpu.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <vsprintf.h> #include <asm/io.h> #include <asm/arch/hardware.h>
arch/arm/mach-bcm283x/init.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_legacy.h> int arch_cpu_init (void ) {
arch/arm/mach-exynos/soc.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/system.h>
arch/arm/mach-imx/cache.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/armv7.h> #include <asm/pl310.h> #include <asm/io.h>
arch/arm/mach-imx/imx8/cpu.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <clk.h> #include <cpu.h> +#include <cpu_legacy.h> #include <dm.h> #include <dm/device-internal.h> #include <dm/lists.h>
arch/arm/mach-imx/imx8m/soc.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/arch/imx-regs.h> #include <asm/io.h> #include <asm/arch/clock.h>
arch/arm/mach-imx/mx5/soc.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/arch/imx-regs.h> #include <asm/arch/clock.h> #include <asm/arch/sys_proto.h>
arch/arm/mach-keystone/init.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <ns16550.h> #include <asm/io.h> #include <asm/arch/msmc.h>
arch/arm/mach-mediatek/cpu.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <wdt.h> #include <dm/uclass-internal.h>
arch/arm/mach-mvebu/armada8k/cpu.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <fdtdec.h> #include <linux/libfdt.h>
arch/arm/mach-mvebu/cpu.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <ahci.h> +#include <cpu_legacy.h> #include <linux/mbus.h> #include <asm/io.h> #include <asm/pl310.h>
arch/arm/mach-omap2/omap-cache.c +1 -0
@@ -12,6 +12,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/cache.h> DECLARE_GLOBAL_DATA_PTR ;
arch/arm/mach-orion5x/cpu.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <netdev.h> #include <asm/cache.h> #include <asm/io.h>
arch/arm/mach-rmobile/cpu_info.c +1 -0
@@ -4,6 +4,7 @@* (C) Copyright 2012 Renesas Solutions Corp. */ #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <env.h> #include <linux/ctype.h>
arch/arm/mach-rmobile/memmap-gen3.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/armv8/mmu.h> #define GEN3_NR_REGIONS 16
arch/arm/mach-rockchip/board.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> #include <clk.h> +#include <cpu_legacy.h> #include <dm.h> #include <ram.h> #include <syscon.h>
arch/arm/mach-s5pc1xx/cache.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void enable_caches (void )
arch/arm/mach-socfpga/misc.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <errno.h> #include <fdtdec.h>
arch/arm/mach-socfpga/spl_a10.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/pl310.h> #include <asm/u-boot.h>
arch/arm/mach-stm32mp/cpu.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> #include <clk.h> +#include <cpu_legacy.h> #include <debug_uart.h> #include <env.h> #include <misc.h>
arch/arm/mach-sunxi/board.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <mmc.h> #include <i2c.h> #include <serial.h>
arch/arm/mach-tegra/board.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <ns16550.h> #include <spl.h>
arch/arm/mach-uniphier/arm32/cache-uniphier.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <linux/io.h> #include <linux/kernel.h> #include <asm/armv7.h>
arch/arm/mach-zynq/cpu.c +1 -0
@@ -4,6 +4,7 @@* Copyright (C) 2012 Xilinx, Inc. All rights reserved. */ #include <common.h> +#include <cpu_legacy.h> #include <zynqpl.h> #include <asm/io.h> #include <asm/arch/clk.h>
arch/m68k/cpu/mcf5227x/cpu_init.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <watchdog.h> #include <asm/immap.h>
arch/m68k/cpu/mcf523x/cpu_init.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <watchdog.h> #include <asm/immap.h> #include <asm/io.h>
arch/m68k/cpu/mcf52x2/cpu_init.c +1 -0
@@ -18,6 +18,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <watchdog.h> #include <asm/immap.h> #include <asm/io.h>
arch/m68k/cpu/mcf530x/cpu_init.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <watchdog.h> #include <asm/immap.h> #include <asm/io.h>
arch/m68k/cpu/mcf532x/cpu_init.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <watchdog.h> #include <asm/immap.h> #include <asm/io.h>
arch/m68k/cpu/mcf5445x/cpu_init.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <watchdog.h> #include <asm/immap.h> #include <asm/processor.h>
arch/m68k/cpu/mcf547x_8x/cpu_init.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <MCD_dma.h> +#include <cpu_legacy.h> #include <asm/immap.h> #include <asm/io.h>
arch/m68k/lib/cache.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/immap.h> #include <asm/cache.h>
arch/microblaze/cpu/cache.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/asm.h> int dcache_status (void )
arch/mips/lib/cache.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/cacheops.h> #ifdef CONFIG_MIPS_L2_CACHE #include <asm/cm.h>
arch/nds32/cpu/n1213/ae3xx/cpu.c +1 -0
@@ -15,6 +15,7 @@/* CPU specific code */ #include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <watchdog.h> #include <asm/cache.h>
arch/nds32/cpu/n1213/ag101/cpu.c +1 -0
@@ -15,6 +15,7 @@/* CPU specific code */ #include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <watchdog.h> #include <asm/cache.h>
arch/nds32/lib/cache.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #if !(CONFIG_IS_ENABLED (SYS_ICACHE_OFF ) &&CONFIG_IS_ENABLED (SYS_DCACHE_OFF ))static inline unsigned long CACHE_SET (unsigned char cache) {
arch/nios2/lib/cache.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/cache.h> DECLARE_GLOBAL_DATA_PTR ;
arch/powerpc/cpu/mpc83xx/spd_sdram.c +1 -0
@@ -13,6 +13,7 @@#ifndef CONFIG_MPC83XX_SDRAM #include <common.h> +#include <cpu_legacy.h> #include <vsprintf.h> #include <asm/processor.h> #include <asm/io.h>
arch/powerpc/cpu/mpc8xx/cache.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/processor.h> #include <asm/ppc.h> #include <asm/io.h>
arch/riscv/cpu/ax25/cache.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <dm/uclass-internal.h> #include <cache.h>
arch/riscv/cpu/ax25/cpu.c +1 -0
@@ -6,6 +6,7 @@/* CPU specific code */ #include <common.h> +#include <cpu_legacy.h> #include <asm/cache.h> /*
arch/riscv/lib/cache.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> void invalidate_icache_all (void ) {
arch/sh/cpu/sh4/cache.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/processor.h> #include <asm/system.h>
arch/x86/cpu/cpu.c +1 -0
@@ -21,6 +21,7 @@#include <common.h> #include <acpi_s3.h> #include <command.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <malloc.h>
arch/x86/cpu/i386/cpu.c +1 -0
@@ -19,6 +19,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <asm/control_regs.h> #include <asm/cpu.h>
arch/x86/cpu/mtrr.c +1 -0
@@ -17,6 +17,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/msr.h> #include <asm/mtrr.h>
arch/x86/cpu/x86_64/cpu.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <cpu.h> +#include <cpu_legacy.h> #include <debug_uart.h> /*
arch/x86/lib/spl.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <debug_uart.h> #include <dm.h> #include <malloc.h>
arch/xtensa/lib/cache.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/cache.h> /*
board/armltd/integrator/integrator.c +1 -0
@@ -17,6 +17,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <env.h> #include <netdev.h>
board/cirrus/edb93xx/edb93xx.c +1 -0
@@ -15,6 +15,7 @@#include <config.h> #include <common.h> +#include <cpu_legacy.h> #include <netdev.h> #include <status_led.h> #include <asm/io.h>
board/cobra5272/flash.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <console.h> +#include <cpu_legacy.h> #define PHYS_FLASH_1 CONFIG_SYS_FLASH_BASE#define FLASH_BANK_SIZE 0x200000
board/highbank/highbank.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <ahci.h> +#include <cpu_legacy.h> #include <env.h> #include <netdev.h> #include <scsi.h>
board/st/stih410-b2260/board.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <linux/usb/otg.h> #include <dwc3-sti-glue.h> #include <dwc3-uboot.h>
board/synopsys/hsdk/hsdk.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <config.h> +#include <cpu_legacy.h> #include <env.h> #include <linux/printk.h> #include <linux/kernel.h>
board/syteco/zmx25/zmx25.c +1 -0
@@ -14,6 +14,7 @@* RedBoot tx25_misc.c Copyright (C) 2009 Red Hat */ #include <common.h> +#include <cpu_legacy.h> #include <asm/gpio.h> #include <asm/io.h> #include <asm/arch/imx-regs.h>
board/toradex/colibri_pxa270/colibri_pxa270.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <asm/arch/hardware.h> #include <asm/arch/pxa.h>
board/xilinx/zynqmp/cmds.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <env.h> #include <malloc.h> #include <zynqmp_firmware.h>
cmd/cache.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <linux/compiler.h> static int parse_argv (const char *);
cmd/ti/ddr3.c +1 -0
@@ -5,6 +5,7 @@* Copyright (C) 2012-2017 Texas Instruments Incorporated, <www.ti.com> */ +#include <cpu_legacy.h> #include <asm/arch/hardware.h> #include <asm/cache.h> #include <asm/emif.h>
common/bootm_os.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <bootm.h> +#include <cpu_legacy.h> #include <env.h> #include <fdt_support.h> #include <linux/libfdt.h>
common/kgdb_stubs.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <kgdb.h> #include <serial.h>
common/spl/spl_atf.c +1 -0
@@ -11,6 +11,7 @@#include <common.h> #include <atf_common.h> +#include <cpu_legacy.h> #include <errno.h> #include <spl.h>
drivers/ddr/altera/sdram_arria10.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <errno.h> #include <fdtdec.h> #include <malloc.h>
drivers/ddr/altera/sdram_s10.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <div64.h>
drivers/fpga/zynqpl.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <console.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <fs.h> #include <zynqpl.h>
drivers/video/cfb_console.c +1 -0
@@ -65,6 +65,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <env.h> #include <fdtdec.h> #include <gzip.h>
include/common.h +1 -9
@@ -3,7 +3,7 @@* Common header file for U-Boot * * This file still includes quite a bit of stuff that should be in separate -* headers like command.h and cpu.h. Please think before adding more things. +* headers like command.h. Please think before adding more things. * Patches to remove things are welcome. * * (C) Copyright 2000-2009
@@ -185,14 +185,6 @@ int board_early_init_r (void);int testdram (void );#endif /* CONFIG_SYS_DRAM_TEST */ -/* $(CPU)/start.S */ -int icache_status (void ); -void icache_enable (void ); -void icache_disable (void ); -int dcache_status (void ); -void dcache_enable (void ); -void dcache_disable (void ); -void mmu_disable (void );#if defined(CONFIG_ARM )void relocate_code (ulong );#else
include/cpu_legacy.h +8 -0
@@ -52,4 +52,12 @@ int checkcpu(void);void smp_set_core_boot_addr (unsigned long addr,int corenr);void smp_kick_all_cpus (void ); +int icache_status (void ); +void icache_enable (void ); +void icache_disable (void ); +int dcache_status (void ); +void dcache_enable (void ); +void dcache_disable (void ); +void mmu_disable (void ); +#endif
post/cpu/mpc83xx/ecc.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <mpc83xx.h> #include <watchdog.h> #include <asm/io.h>
post/lib_powerpc/cpu.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> /* * CPU test
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 29/41 common: Drop checkicache() and checkdcache()
In reply to Simon GlassThese are used by only one arch and only within a single file. Drop the declarations from the common file.
---
Changes in v2: None
arch/powerpc/cpu/mpc8xx/cpu.c | 130 +++++++++++++++++----------------- include/common.h | 2 - 2 files changed, 65 insertions(+), 67 deletions(-)
arch/powerpc/cpu/mpc8xx/cpu.c +65 -65
@@ -35,70 +35,6 @@DECLARE_GLOBAL_DATA_PTR ; -static int check_CPU (long clock,uint pvr,uint immr) -{ -immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR ; -uint k; -char buf[32 ]; - -/* the highest 16 bits should be 0x0050 for a 860 */ - -if (PVR_VER (pvr) !=PVR_VER (PVR_8xx)) -return -1 ; - - k = (immr <<16 ) | -in_be16 (&immap->im_cpm.cp_dparam16[PROFF_REVNUM /sizeof (u16)]); - -/* -* Some boards use sockets so different CPUs can be used. -* We have to check chip version in run time. -*/ -switch (k) { -/* MPC866P/MPC866T/MPC859T/MPC859DSL/MPC852T */ -case 0x08010004 :/* Rev. A.0 */ -printf ("MPC866xxxZPnnA" ); -break ; -case 0x08000003 :/* Rev. 0.3 */ -printf ("MPC866xxxZPnn" ); -break ; -case 0x09000000 :/* 870/875/880/885 */ -puts ("MPC885ZPnn" ); -break ; - -default : -printf ("unknown MPC86x (0x%08x)" , k); -break ; - } - -printf (" at %s MHz: " ,strmhz (buf, clock)); - -print_size (checkicache ()," I-Cache " ); -print_size (checkdcache ()," D-Cache" ); - -/* do we have a FEC (860T/P or 852/859/866/885)? */ - -out_be32 (&immap->im_cpm.cp_fec.fec_addr_low,0x12345678 ); -if (in_be32 (&immap->im_cpm.cp_fec.fec_addr_low) ==0x12345678 ) -printf (" FEC present" ); - -putc ('\n' ); - -return 0 ; -} - -/* ------------------------------------------------------------------------- */ - -int checkcpu (void ) -{ -ulong clock = gd->cpu_clk; -uint immr =get_immr ();/* Return full IMMR contents */ -uint pvr =get_pvr (); - -puts ("CPU: " ); - -return check_CPU (clock, pvr, immr); -} -/* ------------------------------------------------------------------------- */ /* L1 i-cache */
@@ -143,7 +79,7 @@ int checkicache(void)/* L1 d-cache */ /* call with cache disabled */ -int checkdcache (void ) +static int checkdcache (void ) {immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR ;memctl8xx_t __iomem *memctl = &immap->im_memctl;
@@ -175,6 +111,70 @@ int checkdcache(void)return lines <<4 ; }; +static int check_CPU (long clock,uint pvr,uint immr) +{ +immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR ; +uint k; +char buf[32 ]; + +/* the highest 16 bits should be 0x0050 for a 860 */ + +if (PVR_VER (pvr) !=PVR_VER (PVR_8xx)) +return -1 ; + + k = (immr <<16 ) | +in_be16 (&immap->im_cpm.cp_dparam16[PROFF_REVNUM /sizeof (u16)]); + +/* +* Some boards use sockets so different CPUs can be used. +* We have to check chip version in run time. +*/ +switch (k) { +/* MPC866P/MPC866T/MPC859T/MPC859DSL/MPC852T */ +case 0x08010004 :/* Rev. A.0 */ +printf ("MPC866xxxZPnnA" ); +break ; +case 0x08000003 :/* Rev. 0.3 */ +printf ("MPC866xxxZPnn" ); +break ; +case 0x09000000 :/* 870/875/880/885 */ +puts ("MPC885ZPnn" ); +break ; + +default : +printf ("unknown MPC86x (0x%08x)" , k); +break ; + } + +printf (" at %s MHz: " ,strmhz (buf, clock)); + +print_size (checkicache ()," I-Cache " ); +print_size (checkdcache ()," D-Cache" ); + +/* do we have a FEC (860T/P or 852/859/866/885)? */ + +out_be32 (&immap->im_cpm.cp_fec.fec_addr_low,0x12345678 ); +if (in_be32 (&immap->im_cpm.cp_fec.fec_addr_low) ==0x12345678 ) +printf (" FEC present" ); + +putc ('\n' ); + +return 0 ; +} + +/* ------------------------------------------------------------------------- */ + +int checkcpu (void ) +{ +ulong clock = gd->cpu_clk; +uint immr =get_immr ();/* Return full IMMR contents */ +uint pvr =get_pvr (); + +puts ("CPU: " ); + +return check_CPU (clock, pvr, immr); +} +/* ------------------------------------------------------------------------- */ void upmconfig (uint upm,uint *table,uint size)
include/common.h +0 -2
@@ -195,8 +195,6 @@ void trap_init (ulong);void s_init (void ); -int checkicache (void ); -int checkdcache (void );void upmconfig (unsigned int ,unsigned int *,unsigned int );ulong get_tbclk (void );void reset_misc (void );
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 29/41 common: Drop checkicache() and checkdcache()
Quoted 4 lines · Simon Glass
These are used by only one arch and only within a single file. Drop the declarations from the common file.
Signed-off-by Simon Glass <[email protected]>
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/a940b1c6/attachment.sig>
PATCH v2 30/41 common: Move ARM cache operations out of common.h
In reply to Simon GlassThese functions are CPU-related and do not use driver model. Move them to cpu_legacy.h
---
Changes in v2: None
arch/arm/cpu/arm926ejs/lpc32xx/cpu.c | 1 + arch/arm/cpu/armv7/cache_v7.c | 1 + arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c | 1 + arch/arm/cpu/armv8/sec_firmware.c | 1 + arch/arm/cpu/pxa/cache.c | 1 + arch/arm/lib/cache.c | 1 + arch/arm/mach-bcm283x/mbox.c | 1 + arch/arm/mach-imx/mx7/psci-mx7.c | 1 + arch/arm/mach-omap2/sec-common.c | 1 + arch/arm/mach-tegra/ivc.c | 1 + arch/microblaze/lib/bootm.c | 1 + arch/mips/lib/reloc.c | 1 + arch/mips/lib/traps.c | 1 + arch/mips/mach-jz47xx/jz4780/jz4780.c | 1 + arch/mips/mach-mtmips/ddr_calibrate.c | 1 + arch/nds32/cpu/n1213/ae3xx/cpu.c | 1 + arch/nios2/cpu/cpu.c | 1 + arch/nios2/lib/bootm.c | 1 + arch/powerpc/lib/bootm.c | 1 + arch/powerpc/lib/cache.c | 1 + arch/riscv/cpu/ax25/cpu.c | 1 + arch/riscv/lib/smp.c | 1 + arch/riscv/lib/spl.c | 1 + arch/sandbox/cpu/cpu.c | 1 + arch/x86/cpu/quark/dram.c | 1 + arch/x86/cpu/quark/quark.c | 1 + arch/xtensa/lib/bootm.c | 1 + board/Arcturus/ucp1020/cmd_arc.c | 1 + board/beckhoff/mx53cx9020/mx53cx9020.c | 1 + board/broadcom/bcmstb/bcmstb.c | 1 + board/cirrus/edb93xx/edb93xx.c | 1 + board/phytec/pfla02/pfla02.c | 1 + board/sandbox/sandbox.c | 1 + cmd/disk.c | 1 + cmd/load.c | 1 + cmd/ximg.c | 1 + common/avb_verify.c | 1 + common/board_r.c | 1 + common/bootm.c | 1 + common/bouncebuf.c | 1 + common/image.c | 1 + common/lcd.c | 1 + common/spl/spl_opensbi.c | 1 + common/update.c | 1 + drivers/ata/ahci.c | 1 + drivers/ata/dwc_ahsata.c | 1 + drivers/ata/fsl_ahci.c | 1 + drivers/ata/fsl_sata.c | 1 + drivers/ata/sata_mv.c | 1 + drivers/ata/sata_sil.c | 1 + drivers/bootcount/bootcount.c | 1 + drivers/bootcount/bootcount_ram.c | 1 + drivers/core/device.c | 1 + drivers/crypto/fsl/fsl_blob.c | 1 + drivers/crypto/fsl/fsl_hash.c | 1 + drivers/crypto/fsl/jobdesc.c | 1 + drivers/crypto/fsl/jr.c | 1 + drivers/dma/apbh_dma.c | 1 + drivers/dma/bcm6348-iudma.c | 1 + drivers/dma/dma-uclass.c | 1 + drivers/dma/ti/k3-udma.c | 1 + drivers/fpga/versalpl.c | 1 + drivers/fpga/zynqmppl.c | 1 + drivers/mmc/dw_mmc.c | 1 + drivers/mmc/fsl_esdhc.c | 1 + drivers/mmc/fsl_esdhc_imx.c | 1 + drivers/mmc/fsl_esdhc_spl.c | 1 + drivers/mmc/meson_gx_mmc.c | 1 + drivers/mmc/omap_hsmmc.c | 1 + drivers/mmc/sdhci.c | 1 + drivers/mmc/stm32_sdmmc2.c | 1 + drivers/mmc/tmio-common.c | 1 + drivers/mtd/nand/raw/denali.c | 1 + drivers/mtd/nand/raw/fsl_elbc_spl.c | 1 + drivers/mtd/nand/raw/fsl_ifc_spl.c | 1 + drivers/mtd/nand/raw/mxs_nand.c | 1 + drivers/mtd/pic32_flash.c | 1 + drivers/mtd/spi/fsl_espi_spl.c | 1 + drivers/net/ag7xxx.c | 1 + drivers/net/altera_tse.c | 1 + drivers/net/bcm-sf2-eth-gmac.c | 1 + drivers/net/designware.c | 1 + drivers/net/dwc_eth_qos.c | 1 + drivers/net/e1000.c | 1 + drivers/net/ethoc.c | 1 + drivers/net/fec_mxc.c | 1 + drivers/net/fsl-mc/mc.c | 1 + drivers/net/ftgmac100.c | 1 + drivers/net/ftmac100.c | 1 + drivers/net/higmacv300.c | 1 + drivers/net/ldpaa_eth/ldpaa_eth.c | 1 + drivers/net/macb.c | 1 + drivers/net/mt7628-eth.c | 1 + drivers/net/mtk_eth.c | 1 + drivers/net/mvneta.c | 1 + drivers/net/mvpp2.c | 1 + drivers/net/pch_gbe.c | 1 + drivers/net/pcnet.c | 1 + drivers/net/pic32_eth.c | 1 + drivers/net/ravb.c | 1 + drivers/net/rtl8139.c | 1 + drivers/net/rtl8169.c | 1 + drivers/net/sh_eth.c | 1 + drivers/net/sni_ave.c | 1 + drivers/net/sun8i_emac.c | 1 + drivers/net/ti/cpsw.c | 1 + drivers/net/ti/davinci_emac.c | 1 + drivers/net/xilinx_axi_emac.c | 1 + drivers/net/zynq_gem.c | 1 + drivers/nvme/nvme.c | 1 + drivers/remoteproc/rproc-elf-loader.c | 1 + drivers/spi/mxs_spi.c | 1 + drivers/spi/ti_qspi.c | 1 + drivers/spi/zynqmp_gqspi.c | 1 + drivers/usb/dwc3/core.c | 1 + drivers/usb/dwc3/dwc3-generic.c | 1 + drivers/usb/dwc3/ep0.c | 1 + drivers/usb/dwc3/gadget.c | 1 + drivers/usb/dwc3/io.h | 1 + drivers/usb/gadget/ci_udc.c | 1 + drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c | 3 +++ drivers/usb/gadget/fotg210.c | 1 + drivers/usb/host/dwc2.c | 1 + drivers/usb/host/ehci-hcd.c | 1 + drivers/usb/host/ohci-hcd.c | 1 + drivers/usb/host/xhci-mem.c | 1 + drivers/usb/host/xhci-ring.c | 1 + drivers/usb/host/xhci.c | 1 + drivers/video/atmel_hlcdfb.c | 1 + drivers/video/sunxi/sunxi_display.c | 1 + drivers/video/video-uclass.c | 1 + include/common.h | 24 ---------------------- include/cpu_legacy.h | 24 ++++++++++++++++++++++ lib/efi_loader/efi_image_loader.c | 1 + lib/efi_loader/efi_runtime.c | 1 + post/cpu/mpc83xx/ecc.c | 1 + 136 files changed, 160 insertions(+), 24 deletions(-)
arch/arm/cpu/arm926ejs/lpc32xx/cpu.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <netdev.h> #include <asm/arch/cpu.h> #include <asm/arch/clk.h>
arch/arm/cpu/armv7/cache_v7.c +1 -0
@@ -4,6 +4,7 @@* Texas Instruments, <www.ti.com> * Aneesh V <[email protected]> */ +#include <cpu_legacy.h> #include <linux/types.h> #include <common.h> #include <asm/armv7.h>
arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c +1 -0
@@ -6,6 +6,7 @@*/ #include <config.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/psci.h> #include <asm/arch/immap_ls102xa.h>
arch/arm/cpu/armv8/sec_firmware.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <errno.h> #include <linux/kernel.h> #include <asm/io.h>
arch/arm/cpu/pxa/cache.c +1 -0
@@ -3,6 +3,7 @@* (C) Copyright 2016 Vasily Khoruzhick <[email protected]> */ +#include <cpu_legacy.h> #include <linux/types.h> #include <common.h>
arch/arm/lib/cache.c +1 -0
@@ -7,6 +7,7 @@/* for now: just dummy functions to satisfy the linker */ #include <common.h> +#include <cpu_legacy.h> #include <malloc.h> /*
arch/arm/mach-bcm283x/mbox.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/arch/mbox.h> #include <phys2bus.h>
arch/arm/mach-imx/mx7/psci-mx7.c +1 -0
@@ -4,6 +4,7 @@* Copyright 2017 NXP */ +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/psci.h> #include <asm/secure.h>
arch/arm/mach-omap2/sec-common.c +1 -0
@@ -13,6 +13,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <stdarg.h> #include <asm/arch/sys_proto.h>
arch/arm/mach-tegra/ivc.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/arch-tegra/ivc.h>
arch/microblaze/lib/bootm.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <env.h> #include <fdt_support.h> #include <image.h>
arch/mips/lib/reloc.c +1 -0
@@ -27,6 +27,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/relocs.h> #include <asm/sections.h>
arch/mips/lib/traps.c +1 -0
@@ -11,6 +11,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/mipsregs.h> #include <asm/addrspace.h> #include <asm/system.h>
arch/mips/mach-jz47xx/jz4780/jz4780.c +1 -0
@@ -8,6 +8,7 @@#include <config.h> #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/sections.h> #include <mach/jz4780.h>
arch/mips/mach-mtmips/ddr_calibrate.c +1 -0
@@ -17,6 +17,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <linux/io.h> #include <asm/cacheops.h> #include <asm/io.h>
arch/nds32/cpu/n1213/ae3xx/cpu.c +1 -0
@@ -16,6 +16,7 @@#include <common.h> #include <command.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #include <watchdog.h> #include <asm/cache.h>
arch/nios2/cpu/cpu.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <cpu.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <asm/cache.h>
arch/nios2/lib/bootm.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #define NIOS_MAGIC 0x534f494e/* enable command line and initrd passing */
arch/powerpc/lib/bootm.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> +#include <cpu_legacy.h> #include <env.h> #include <watchdog.h> #include <command.h>
arch/powerpc/lib/cache.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/cache.h> #include <watchdog.h>
arch/riscv/cpu/ax25/cpu.c +1 -0
@@ -7,6 +7,7 @@/* CPU specific code */ #include <common.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #include <asm/cache.h> /*
arch/riscv/lib/smp.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <asm/barrier.h> #include <asm/smp.h>
arch/riscv/lib/spl.c +1 -0
@@ -4,6 +4,7 @@* Lukas Auer <[email protected]> */ #include <common.h> +#include <cpu_legacy.h> #include <spl.h> #include <asm/smp.h>
arch/sandbox/cpu/cpu.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <linux/libfdt.h>
arch/x86/cpu/quark/dram.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <errno.h> #include <fdtdec.h> #include <malloc.h>
arch/x86/cpu/quark/quark.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <cpu.h> +#include <cpu_legacy.h> #include <mmc.h> #include <asm/io.h> #include <asm/ioapic.h>
arch/xtensa/lib/bootm.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <env.h> #include <u-boot/zlib.h> #include <asm/byteorder.h>
board/Arcturus/ucp1020/cmd_arc.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <div64.h> #include <env.h> #include <malloc.h>
board/beckhoff/mx53cx9020/mx53cx9020.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/arch/sys_proto.h> #include <asm/arch/clock.h> #include <asm/arch/iomux-mx53.h>
board/broadcom/bcmstb/bcmstb.c +1 -0
@@ -6,6 +6,7 @@* Author: Thomas Fitzsimmons <[email protected]> */ +#include <cpu_legacy.h> #include <time.h> #include <linux/types.h> #include <common.h>
board/cirrus/edb93xx/edb93xx.c +1 -0
@@ -16,6 +16,7 @@#include <config.h> #include <common.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #include <netdev.h> #include <status_led.h> #include <asm/io.h>
board/phytec/pfla02/pfla02.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch/imx-regs.h>
board/sandbox/sandbox.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <cros_ec.h> #include <dm.h> #include <led.h>
cmd/disk.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <part.h> int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
cmd/load.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <command.h> #include <console.h> +#include <cpu_legacy.h> #include <env.h> #include <s_record.h> #include <net.h>
cmd/ximg.c +1 -0
@@ -13,6 +13,7 @@*/ #include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <env.h> #include <gzip.h> #include <image.h>
common/avb_verify.c +1 -0
@@ -6,6 +6,7 @@#include <avb_verify.h> #include <blk.h> +#include <cpu_legacy.h> #include <fastboot.h> #include <image.h> #include <malloc.h>
common/board_r.c +1 -0
@@ -11,6 +11,7 @@#include <common.h> #include <api.h> +#include <cpu_legacy.h> #include <u-boot/crc.h> /* TODO: can we just include all these headers whether needed or not? */ #if defined(CONFIG_CMD_BEDBUG )
common/bootm.c +1 -0
@@ -7,6 +7,7 @@#ifndef USE_HOSTCC #include <common.h> #include <bootstage.h> +#include <cpu_legacy.h> #include <env.h> #include <errno.h> #include <fdt_support.h>
common/bouncebuf.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <errno.h> #include <bouncebuf.h>
common/image.c +1 -0
@@ -8,6 +8,7 @@#ifndef USE_HOSTCC #include <common.h> +#include <cpu_legacy.h> #include <env.h> #include <u-boot/crc.h> #include <watchdog.h>
common/lcd.c +1 -0
@@ -10,6 +10,7 @@#include <config.h> #include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <env_callback.h> #include <linux/types.h> #include <stdio_dev.h>
common/spl/spl_opensbi.c +1 -0
@@ -6,6 +6,7 @@* Based on common/spl/spl_atf.c */ #include <common.h> +#include <cpu_legacy.h> #include <errno.h> #include <spl.h> #include <asm/smp.h>
common/update.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #if !(defined(CONFIG_FIT ) && defined(CONFIG_OF_LIBFDT ))#error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature"
drivers/ata/ahci.c +1 -0
@@ -9,6 +9,7 @@* This driver provides a SCSI interface to SATA. */ #include <common.h> +#include <cpu_legacy.h> #include <command.h> #include <dm.h>
drivers/ata/dwc_ahsata.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <ahci.h> +#include <cpu_legacy.h> #include <dm.h> #include <dwc_ahsata.h> #include <fis.h>
drivers/ata/fsl_ahci.c +1 -0
@@ -6,6 +6,7 @@* */ #include <common.h> +#include <cpu_legacy.h> #include <asm/fsl_serdes.h> #include <dm/lists.h> #include <dm.h>
drivers/ata/fsl_sata.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <command.h> #include <console.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/processor.h> #include <asm/fsl_serdes.h>
drivers/ata/sata_mv.c +1 -0
@@ -33,6 +33,7 @@#include <common.h> #include <ahci.h> +#include <cpu_legacy.h> #include <dm.h> #include <dm/device-internal.h> #include <dm/lists.h>
drivers/ata/sata_sil.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <pci.h> #include <command.h> #include <asm/byteorder.h>
drivers/bootcount/bootcount.c +1 -0
@@ -5,6 +5,7 @@*/ #include <bootcount.h> +#include <cpu_legacy.h> #include <linux/compiler.h> /* Now implement the generic default functions */
drivers/bootcount/bootcount_ram.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> DECLARE_GLOBAL_DATA_PTR ;
drivers/core/device.c +1 -0
@@ -9,6 +9,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <clk.h> #include <fdtdec.h>
drivers/crypto/fsl/fsl_blob.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <memalign.h> #include <fsl_sec.h>
drivers/crypto/fsl/fsl_hash.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <memalign.h> #include "jobdesc.h"
drivers/crypto/fsl/jobdesc.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <fsl_sec.h> #include "desc_constr.h" #include "jobdesc.h"
drivers/crypto/fsl/jr.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include "fsl_sec.h" #include "jr.h"
drivers/dma/apbh_dma.c +1 -0
@@ -9,6 +9,7 @@* Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved. */ +#include <cpu_legacy.h> #include <linux/list.h> #include <common.h>
drivers/dma/bcm6348-iudma.c +1 -0
@@ -17,6 +17,7 @@#include <common.h> #include <clk.h> +#include <cpu_legacy.h> #include <dm.h> #include <dma-uclass.h> #include <memalign.h>
drivers/dma/dma-uclass.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <dm/read.h> #include <dma-uclass.h>
drivers/dma/ti/k3-udma.c +1 -0
@@ -6,6 +6,7 @@#define pr_fmt (fmt) "udma: " fmt#include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/bitops.h> #include <malloc.h>
drivers/fpga/versalpl.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/arch/sys_proto.h> #include <memalign.h> #include <versalpl.h>
drivers/fpga/zynqmppl.c +1 -0
@@ -7,6 +7,7 @@#include <console.h> #include <common.h> +#include <cpu_legacy.h> #include <zynqmppl.h> #include <zynqmp_firmware.h> #include <linux/sizes.h>
drivers/mmc/dw_mmc.c +1 -0
@@ -7,6 +7,7 @@#include <bouncebuf.h> #include <common.h> +#include <cpu_legacy.h> #include <errno.h> #include <malloc.h> #include <memalign.h>
drivers/mmc/fsl_esdhc.c +1 -0
@@ -13,6 +13,7 @@#include <common.h> #include <command.h> #include <clk.h> +#include <cpu_legacy.h> #include <errno.h> #include <hwconfig.h> #include <mmc.h>
drivers/mmc/fsl_esdhc_imx.c +1 -0
@@ -14,6 +14,7 @@#include <common.h> #include <command.h> #include <clk.h> +#include <cpu_legacy.h> #include <errno.h> #include <hwconfig.h> #include <mmc.h>
drivers/mmc/fsl_esdhc_spl.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <mmc.h> #include <malloc.h>
drivers/mmc/meson_gx_mmc.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <fdtdec.h> #include <malloc.h>
drivers/mmc/omap_hsmmc.c +1 -0
@@ -24,6 +24,7 @@#include <config.h> #include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <memalign.h> #include <mmc.h>
drivers/mmc/sdhci.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <malloc.h>
drivers/mmc/stm32_sdmmc2.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <clk.h> +#include <cpu_legacy.h> #include <dm.h> #include <fdtdec.h> #include <linux/libfdt.h>
drivers/mmc/tmio-common.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <clk.h> +#include <cpu_legacy.h> #include <fdtdec.h> #include <mmc.h> #include <dm.h>
drivers/mtd/nand/raw/denali.c +1 -0
@@ -5,6 +5,7 @@* Copyright (C) 2009-2010, Intel Corporation and its suppliers. */ +#include <cpu_legacy.h> #include <dm.h> #include <nand.h> #include <linux/bitfield.h>
drivers/mtd/nand/raw/fsl_elbc_spl.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/fsl_lbc.h> #include <nand.h>
drivers/mtd/nand/raw/fsl_ifc_spl.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <fsl_ifc.h> #include <linux/mtd/rawnand.h>
drivers/mtd/nand/raw/mxs_nand.c +1 -0
@@ -13,6 +13,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <linux/mtd/rawnand.h> #include <linux/sizes.h>
drivers/mtd/pic32_flash.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <fdt_support.h> #include <flash.h>
drivers/mtd/spi/fsl_espi_spl.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <spi_flash.h> #include <malloc.h>
drivers/net/ag7xxx.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <miiphy.h>
drivers/net/altera_tse.c +1 -0
@@ -9,6 +9,7 @@* published by the Free Software Foundation. */ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <fdt_support.h>
drivers/net/bcm-sf2-eth-gmac.c +1 -0
@@ -11,6 +11,7 @@#include <config.h> #include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <net.h> #include <asm/io.h>
drivers/net/designware.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <clk.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <miiphy.h>
drivers/net/dwc_eth_qos.c +1 -0
@@ -28,6 +28,7 @@*/ #include <common.h> #include <clk.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <memalign.h>
drivers/net/e1000.c +1 -0
@@ -30,6 +30,7 @@ tested on both gig copper and gig fiber boards*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <memalign.h>
drivers/net/ethoc.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <dm/platform_data/net_ethoc.h> #include <linux/io.h>
drivers/net/fec_mxc.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <env.h> #include <malloc.h>
drivers/net/fsl-mc/mc.c +1 -0
@@ -5,6 +5,7 @@* Copyright 2017-2018 NXP */ #include <common.h> +#include <cpu_legacy.h> #include <env.h> #include <errno.h> #include <linux/bug.h>
drivers/net/ftgmac100.c +1 -0
@@ -12,6 +12,7 @@*/ #include <clk.h> +#include <cpu_legacy.h> #include <dm.h> #include <miiphy.h> #include <net.h>
drivers/net/ftmac100.c +1 -0
@@ -8,6 +8,7 @@#include <config.h> #include <common.h> +#include <cpu_legacy.h> #include <env.h> #include <malloc.h> #include <net.h>
drivers/net/higmacv300.c +1 -0
@@ -3,6 +3,7 @@* Copyright (c) 2019, Linaro Limited */ +#include <cpu_legacy.h> #include <asm/io.h> #include <common.h> #include <console.h>
drivers/net/ldpaa_eth/ldpaa_eth.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/types.h> #include <malloc.h>
drivers/net/macb.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> #include <clk.h> +#include <cpu_legacy.h> #include <dm.h> /*
drivers/net/mt7628-eth.c +1 -0
@@ -14,6 +14,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <malloc.h> #include <miiphy.h>
drivers/net/mtk_eth.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <malloc.h> #include <miiphy.h>
drivers/net/mvneta.c +1 -0
@@ -13,6 +13,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <net.h> #include <netdev.h>
drivers/net/mvpp2.c +1 -0
@@ -14,6 +14,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <dm/device-internal.h> #include <dm/lists.h>
drivers/net/pch_gbe.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <asm/io.h>
drivers/net/pcnet.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <net.h> #include <netdev.h>
drivers/net/pic32_eth.c +1 -0
@@ -4,6 +4,7 @@* */ #include <common.h> +#include <cpu_legacy.h> #include <errno.h> #include <dm.h> #include <net.h>
drivers/net/ravb.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <clk.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <miiphy.h>
drivers/net/rtl8139.c +1 -0
@@ -72,6 +72,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <net.h> #include <netdev.h>
drivers/net/rtl8169.c +1 -0
@@ -40,6 +40,7 @@* Modified to use le32_to_cpu and cpu_to_le32 properly */ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <malloc.h>
drivers/net/sh_eth.c +1 -0
@@ -10,6 +10,7 @@#include <config.h> #include <common.h> +#include <cpu_legacy.h> #include <env.h> #include <malloc.h> #include <net.h>
drivers/net/sni_ave.c +1 -0
@@ -5,6 +5,7 @@*/ #include <clk.h> +#include <cpu_legacy.h> #include <dm.h> #include <fdt_support.h> #include <linux/io.h>
drivers/net/sun8i_emac.c +1 -0
@@ -10,6 +10,7 @@* */ +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch/gpio.h>
drivers/net/ti/cpsw.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <net.h> #include <miiphy.h> #include <malloc.h>
drivers/net/ti/davinci_emac.c +1 -0
@@ -23,6 +23,7 @@*/ #include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <net.h> #include <miiphy.h> #include <malloc.h>
drivers/net/xilinx_axi_emac.c +1 -0
@@ -7,6 +7,7 @@#include <config.h> #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <net.h> #include <malloc.h>
drivers/net/zynq_gem.c +1 -0
@@ -10,6 +10,7 @@#include <clk.h> #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <net.h> #include <netdev.h>
drivers/nvme/nvme.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <memalign.h>
drivers/remoteproc/rproc-elf-loader.c +1 -0
@@ -3,6 +3,7 @@* Copyright (C) 2019, STMicroelectronics - All Rights Reserved */ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <elf.h> #include <remoteproc.h>
drivers/spi/mxs_spi.c +1 -0
@@ -13,6 +13,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <memalign.h> #include <spi.h>
drivers/spi/ti_qspi.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/arch/omap.h> #include <malloc.h>
drivers/spi/zynqmp_gqspi.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/arch/sys_proto.h> #include <asm/io.h> #include <clk.h>
drivers/usb/dwc3/core.c +1 -0
@@ -14,6 +14,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <dwc3-uboot.h> #include <asm/dma-mapping.h>
drivers/usb/dwc3/dwc3-generic.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm-generic/io.h> #include <dm.h> #include <dm/device-internal.h>
drivers/usb/dwc3/ep0.c +1 -0
@@ -13,6 +13,7 @@* commit c00552ebaf : Merge 3.18-rc7 into usb-next */ #include <common.h> +#include <cpu_legacy.h> #include <linux/kernel.h> #include <linux/list.h>
drivers/usb/dwc3/gadget.c +1 -0
@@ -14,6 +14,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <asm/dma-mapping.h> #include <linux/bug.h>
drivers/usb/dwc3/io.h +1 -0
@@ -17,6 +17,7 @@#ifndef __DRIVERS_USB_DWC3_IO_H#define __DRIVERS_USB_DWC3_IO_H +#include <cpu_legacy.h> #include <asm/io.h> #define CACHELINE_SIZE CONFIG_SYS_CACHELINE_SIZE
drivers/usb/gadget/ci_udc.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <command.h> #include <config.h> +#include <cpu_legacy.h> #include <net.h> #include <malloc.h> #include <asm/byteorder.h>
drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c +3 -0
@@ -17,6 +17,9 @@* Lukasz Majewski <[email protected]> */ +#include <common.h> +#include <cpu_legacy.h> +static u8 clear_feature_num;int clear_feature_flag;
drivers/usb/gadget/fotg210.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <command.h> #include <config.h> +#include <cpu_legacy.h> #include <net.h> #include <malloc.h> #include <asm/io.h>
drivers/usb/host/dwc2.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <usb.h>
drivers/usb/host/ehci-hcd.c +1 -0
@@ -7,6 +7,7 @@* All rights reserved. */ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <asm/byteorder.h>
drivers/usb/host/ohci-hcd.c +1 -0
@@ -28,6 +28,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/byteorder.h> #include <dm.h> #include <errno.h>
drivers/usb/host/xhci-mem.c +1 -0
@@ -14,6 +14,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <asm/byteorder.h> #include <usb.h>
drivers/usb/host/xhci-ring.c +1 -0
@@ -14,6 +14,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/byteorder.h> #include <usb.h> #include <asm/unaligned.h>
drivers/usb/host/xhci.c +1 -0
@@ -20,6 +20,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <asm/byteorder.h> #include <usb.h>
drivers/video/atmel_hlcdfb.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/arch/gpio.h> #include <asm/arch/clk.h>
drivers/video/sunxi/sunxi_display.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <efi_loader.h> #include <time.h>
drivers/video/video-uclass.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <mapmem.h> #include <stdio_dev.h>
include/common.h +0 -24
@@ -218,30 +218,6 @@ void reset_timer (void);void enable_interrupts (void );int disable_interrupts (void ); -/* arch/$(ARCH)/lib/cache.c */ -void enable_caches (void ); -void flush_cache (unsigned long ,unsigned long ); -void flush_dcache_all (void ); -void flush_dcache_range (unsigned long start,unsigned long stop); -void invalidate_dcache_range (unsigned long start,unsigned long stop); -void invalidate_dcache_all (void ); -void invalidate_icache_all (void ); - -enum { -/* Disable caches (else flush caches but leave them active) */ -CBL_DISABLE_CACHES =1 <<0 , -CBL_SHOW_BOOTSTAGE_REPORT =1 <<1 , - -CBL_ALL =3 , -}; - -/** -* Clean up ready for linux -* -* @param flags Flags to control what is done -*/ -int cleanup_before_linux_select (int flags); -/* lib/uuid.c */ #include <uuid.h>
include/cpu_legacy.h +24 -0
@@ -60,4 +60,28 @@ void dcache_enable(void);void dcache_disable (void );void mmu_disable (void ); +/* arch/$(ARCH)/lib/cache.c */ +void enable_caches (void ); +void flush_cache (unsigned long addr,unsigned long size); +void flush_dcache_all (void ); +void flush_dcache_range (unsigned long start,unsigned long stop); +void invalidate_dcache_range (unsigned long start,unsigned long stop); +void invalidate_dcache_all (void ); +void invalidate_icache_all (void ); + +enum { +/* Disable caches (else flush caches but leave them active) */ +CBL_DISABLE_CACHES =1 <<0 , +CBL_SHOW_BOOTSTAGE_REPORT =1 <<1 , + +CBL_ALL =3 , +}; + +/** +* Clean up ready for linux +* +* @param flags Flags to control what is done +*/ +int cleanup_before_linux_select (int flags); +;#endif
lib/efi_loader/efi_image_loader.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <cpu_legacy.h> #include <efi_loader.h> #include <pe.h>
lib/efi_loader/efi_runtime.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <dm.h> #include <elf.h> #include <efi_loader.h>
post/cpu/mpc83xx/ecc.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #include <mpc83xx.h> #include <watchdog.h> #include <asm/io.h>
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 31/41 arm: powerpc: Tidy up code style for interrupt functions
In reply to Simon GlassRemove the unwanted space before the bracket.
---
Changes in v2: None
arch/arm/cpu/arm11/cpu.c | 2 +- arch/arm/cpu/arm920t/cpu.c | 2 +- arch/arm/cpu/arm926ejs/cpu.c | 2 +- arch/arm/cpu/arm946es/cpu.c | 2 +- arch/arm/cpu/sa1100/cpu.c | 2 +- arch/arm/lib/interrupts.c | 6 +++--- arch/m68k/lib/interrupts.c | 8 ++++---- arch/nios2/cpu/interrupts.c | 14 +++++++------- arch/powerpc/cpu/mpc83xx/cpu.c | 2 +- arch/powerpc/cpu/mpc83xx/interrupts.c | 6 +++--- arch/powerpc/cpu/mpc86xx/interrupts.c | 2 +- arch/powerpc/lib/interrupts.c | 8 ++++---- arch/sh/cpu/sh4/interrupts.c | 6 +++--- board/cobra5272/flash.c | 8 ++++---- 14 files changed, 35 insertions(+), 35 deletions(-)
arch/arm/cpu/arm11/cpu.c +1 -1
@@ -30,7 +30,7 @@ int cleanup_before_linux (void)* we turn off caches etc ... */ -disable_interrupts (); +disable_interrupts ();/* turn off I/D-cache */ icache_disable ();
arch/arm/cpu/arm920t/cpu.c +1 -1
@@ -28,7 +28,7 @@ int cleanup_before_linux (void)* we turn off caches etc ... */ -disable_interrupts (); +disable_interrupts ();/* turn off I/D-cache */ icache_disable ();
arch/arm/cpu/arm926ejs/cpu.c +1 -1
@@ -28,7 +28,7 @@ int cleanup_before_linux (void)* we turn off caches etc ... */ -disable_interrupts (); +disable_interrupts ();/* turn off I/D-cache */
arch/arm/cpu/arm946es/cpu.c +1 -1
@@ -29,7 +29,7 @@ int cleanup_before_linux (void)* we turn off caches etc ... */ -disable_interrupts (); +disable_interrupts ();/* ARM926E-S needs the protection unit enabled for the icache to have * been enabled - left for possible later use
arch/arm/cpu/sa1100/cpu.c +1 -1
@@ -30,7 +30,7 @@ int cleanup_before_linux (void)* just disable everything that can disturb booting linux */ -disable_interrupts (); +disable_interrupts ();/* turn off I-cache */ icache_disable ();
arch/arm/lib/interrupts.c +3 -3
@@ -25,7 +25,7 @@DECLARE_GLOBAL_DATA_PTR ; -int interrupt_init (void ) +int interrupt_init (void ) {/* * setup up stacks if necessary
@@ -35,11 +35,11 @@ int interrupt_init (void)return 0 ; } -void enable_interrupts (void ) +void enable_interrupts (void ) {return ; } -int disable_interrupts (void ) +int disable_interrupts (void ) {return 0 ; }
arch/m68k/lib/interrupts.c +4 -4
@@ -42,7 +42,7 @@ static __inline__ void set_sr (unsigned short sr)/* * Install and free an interrupt handler */ -void irq_install_handler (int vec,interrupt_handler_t * handler,void *arg) +void irq_install_handler (int vec,interrupt_handler_t * handler,void *arg) {if ((vec <0 ) || (vec >=NR_IRQS )) { printf ("irq_install_handler: wrong interrupt vector %d\n",
@@ -54,7 +54,7 @@ void irq_install_handler (int vec, interrupt_handler_t * handler, void *arg) irq_vecs[vec].arg = arg; } -void irq_free_handler (int vec) +void irq_free_handler (int vec) {if ((vec <0 ) || (vec >=NR_IRQS )) {return ;
@@ -64,7 +64,7 @@ void irq_free_handler (int vec) irq_vecs[vec].arg =NULL ; } -void enable_interrupts (void ) +void enable_interrupts (void ) {unsigned short sr;
@@ -72,7 +72,7 @@ void enable_interrupts (void)set_sr (sr & ~0x0700 ); } -int disable_interrupts (void ) +int disable_interrupts (void ) {unsigned short sr;
arch/nios2/cpu/interrupts.c +7 -7
@@ -23,7 +23,7 @@ struct irq_action {static struct irq_action vecs[32 ]; -int disable_interrupts (void ) +int disable_interrupts (void ) {int val =rdctl (CTL_STATUS );wrctl (CTL_STATUS , val & ~STATUS_IE );
@@ -36,7 +36,7 @@ void enable_interrupts( void )wrctl (CTL_STATUS , val |STATUS_IE ); } -void external_interrupt (struct pt_regs *regs) +void external_interrupt (struct pt_regs *regs) {unsigned irqs;struct irq_action *act;
@@ -73,7 +73,7 @@ static void def_hdlr (void *arg) }/*************************************************************************/ -void irq_install_handler (int irq,interrupt_handler_t *hdlr,void *arg) +void irq_install_handler (int irq,interrupt_handler_t *hdlr,void *arg) {int flag;
@@ -84,7 +84,7 @@ void irq_install_handler (int irq, interrupt_handler_t *hdlr, void *arg)return ; act = &vecs[irq]; - flag =disable_interrupts (); + flag =disable_interrupts ();if (hdlr) { act->handler = hdlr; act->arg = arg;
@@ -95,11 +95,11 @@ void irq_install_handler (int irq, interrupt_handler_t *hdlr, void *arg) ena &= ~(1 << irq);/* disable */ }wrctl (CTL_IENABLE , ena); -if (flag)enable_interrupts (); +if (flag)enable_interrupts (); } -int interrupt_init (void ) +int interrupt_init (void ) {int i;
@@ -110,7 +110,7 @@ int interrupt_init (void) vecs[i].count =0 ; } -enable_interrupts (); +enable_interrupts ();return (0 ); }
arch/powerpc/cpu/mpc83xx/cpu.c +1 -1
@@ -196,7 +196,7 @@ void watchdog_reset (void) immr->wdt.swsrr =0xaa39 ;if (re_enable) - enable_interrupts (); + enable_interrupts(); }#endif
arch/powerpc/cpu/mpc83xx/interrupts.c +3 -3
@@ -35,7 +35,7 @@ void interrupt_init_cpu (unsigned *decrementer_count)* Handle external interrupts */ -void external_interrupt (struct pt_regs *regs) +void external_interrupt (struct pt_regs *regs) { }
@@ -45,12 +45,12 @@ void external_interrupt (struct pt_regs *regs)*/ void -irq_install_handler (int irq,interrupt_handler_t * handler,void *arg) +irq_install_handler (int irq,interrupt_handler_t * handler,void *arg) { } -void irq_free_handler (int irq) +void irq_free_handler (int irq) { }
arch/powerpc/cpu/mpc86xx/interrupts.c +1 -1
@@ -108,5 +108,5 @@ int do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])*/ void external_interrupt (struct pt_regs *regs) { -puts ("external_interrupt (oops!)\n" ); +puts ("external_interrupt(oops!)\n" ); }
arch/powerpc/lib/interrupts.c +4 -4
@@ -38,13 +38,13 @@ static __inline__ void set_dec (unsigned long val) }#endif /* !CONFIG_MPC83XX_TIMER */ -void enable_interrupts (void ) +void enable_interrupts (void ) {set_msr (get_msr () |MSR_EE ); }/* returns flag if MSR_EE was set before */ -int disable_interrupts (void ) +int disable_interrupts (void ) {ulong msr =get_msr ();
@@ -53,7 +53,7 @@ int disable_interrupts (void) }#ifndef CONFIG_MPC83XX_TIMER -int interrupt_init (void ) +int interrupt_init (void ) {/* call cpu specific function from $(CPU)/interrupts.c */ interrupt_init_cpu (&decrementer_count);
@@ -67,7 +67,7 @@ int interrupt_init (void)static volatile ulong timestamp =0 ; -void timer_interrupt (struct pt_regs *regs) +void timer_interrupt (struct pt_regs *regs) {/* call cpu specific function from $(CPU)/interrupts.c */ timer_interrupt_cpu (regs);
arch/sh/cpu/sh4/interrupts.c +3 -3
@@ -6,16 +6,16 @@#include <common.h> -int interrupt_init (void ) +int interrupt_init (void ) {return 0 ; } -void enable_interrupts (void ) +void enable_interrupts (void ) { } -int disable_interrupts (void ){ +int disable_interrupts (void ){return 0 ; }
board/cobra5272/flash.c +4 -4
@@ -167,7 +167,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) cflag =icache_status ();icache_disable (); - iflag =disable_interrupts (); + iflag =disable_interrupts ();printf ("\n" );
@@ -235,7 +235,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)udelay (10000 );if (iflag) -enable_interrupts (); +enable_interrupts ();if (cflag)icache_enable ();
@@ -270,7 +270,7 @@ static int write_word (flash_info_t * info, ulong dest, ulong data) cflag =icache_status ();icache_disable (); - iflag =disable_interrupts (); + iflag =disable_interrupts ();MEM_FLASH_ADDR1 =CMD_UNLOCK1 ;MEM_FLASH_ADDR2 =CMD_UNLOCK2 ;
@@ -301,7 +301,7 @@ static int write_word (flash_info_t * info, ulong dest, ulong data) rc =ERR_PROG_ERROR ;if (iflag) -enable_interrupts (); +enable_interrupts ();if (cflag)icache_enable ();
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 31/41 arm: powerpc: Tidy up code style for interrupt functions
Quoted 3 lines · Simon Glass
Remove the unwanted space before the bracket.
Signed-off-by Simon Glass <[email protected]>
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/11324bf8/attachment.sig>
PATCH v2 32/41 common: Move interrupt functions into a new header
In reply to Simon GlassThese functions do not use driver model but are fairly widely used in U-Boot. Move them to a new irq_legacy.h header file.
---
Changes in v2: None
arch/arc/lib/interrupts.c | 1 + arch/arm/lib/interrupts.c | 1 + arch/arm/lib/interrupts_64.c | 1 + arch/arm/lib/interrupts_m.c | 1 + arch/m68k/cpu/mcf5227x/interrupts.c | 1 + arch/m68k/cpu/mcf523x/interrupts.c | 1 + arch/m68k/cpu/mcf52x2/interrupts.c | 1 + arch/m68k/cpu/mcf530x/interrupts.c | 1 + arch/m68k/cpu/mcf532x/interrupts.c | 1 + arch/m68k/cpu/mcf5445x/interrupts.c | 1 + arch/m68k/cpu/mcf547x_8x/interrupts.c | 1 + arch/m68k/cpu/mcf547x_8x/slicetimer.c | 1 + arch/m68k/lib/interrupts.c | 1 + arch/m68k/lib/time.c | 1 + arch/microblaze/cpu/interrupts.c | 1 + arch/mips/cpu/interrupts.c | 1 + arch/mips/mach-jz47xx/jz4780/timer.c | 1 + arch/nds32/cpu/n1213/ag101/timer.c | 1 + arch/nds32/lib/interrupts.c | 1 + arch/nios2/cpu/interrupts.c | 1 + arch/powerpc/cpu/mpc83xx/interrupts.c | 1 + arch/powerpc/cpu/mpc85xx/interrupts.c | 1 + arch/powerpc/cpu/mpc85xx/traps.c | 1 + arch/powerpc/cpu/mpc86xx/interrupts.c | 1 + arch/powerpc/cpu/mpc8xx/interrupts.c | 1 + arch/powerpc/lib/interrupts.c | 1 + arch/riscv/lib/interrupts.c | 1 + arch/sandbox/lib/interrupts.c | 1 + arch/sh/cpu/sh4/interrupts.c | 1 + arch/x86/cpu/i386/interrupt.c | 1 + arch/x86/cpu/x86_64/interrupts.c | 1 + arch/x86/lib/bios.c | 1 + arch/x86/lib/interrupts.c | 1 + arch/x86/lib/spl.c | 1 + arch/xtensa/cpu/exceptions.c | 1 + common/board_r.c | 1 + common/spl/spl.c | 1 + drivers/mtd/cfi_flash.c | 1 + drivers/timer/mpc83xx_timer.c | 1 + include/common.h | 7 ------- include/exports.h | 2 ++ include/irq_legacy.h | 17 +++++++++++++++++ 42 files changed, 58 insertions(+), 7 deletions(-) create mode 100644 include/irq_legacy.h
arch/arc/lib/interrupts.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <irq_legacy.h> #include <asm/arcregs.h> #include <asm/ptrace.h>
arch/arm/lib/interrupts.c +1 -0
@@ -20,6 +20,7 @@#include <common.h> #include <efi_loader.h> +#include <irq_legacy.h> #include <asm/proc-armv/ptrace.h> #include <asm/u-boot-arm.h>
arch/arm/lib/interrupts_64.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> #include <linux/compiler.h> #include <efi_loader.h>
arch/arm/lib/interrupts_m.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> /* * Upon exception entry ARMv7-M processors automatically save stack
arch/m68k/cpu/mcf5227x/interrupts.c +1 -0
@@ -10,6 +10,7 @@/* CPU specific interrupt routine */ #include <common.h> +#include <irq_legacy.h> #include <asm/immap.h> #include <asm/io.h>
arch/m68k/cpu/mcf523x/interrupts.c +1 -0
@@ -7,6 +7,7 @@/* CPU specific interrupt routine */ #include <common.h> +#include <irq_legacy.h> #include <asm/immap.h> #include <asm/io.h>
arch/m68k/cpu/mcf52x2/interrupts.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <irq_legacy.h> #include <watchdog.h> #include <asm/processor.h> #include <asm/immap.h>
arch/m68k/cpu/mcf530x/interrupts.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> #include <asm/immap.h> #include <asm/io.h>
arch/m68k/cpu/mcf532x/interrupts.c +1 -0
@@ -7,6 +7,7 @@/* CPU specific interrupt routine */ #include <common.h> +#include <irq_legacy.h> #include <asm/immap.h> #include <asm/io.h>
arch/m68k/cpu/mcf5445x/interrupts.c +1 -0
@@ -10,6 +10,7 @@/* CPU specific interrupt routine */ #include <common.h> +#include <irq_legacy.h> #include <asm/immap.h> #include <asm/io.h>
arch/m68k/cpu/mcf547x_8x/interrupts.c +1 -0
@@ -7,6 +7,7 @@/* CPU specific interrupt routine */ #include <common.h> +#include <irq_legacy.h> #include <asm/immap.h> #include <asm/io.h>
arch/m68k/cpu/mcf547x_8x/slicetimer.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> #include <asm/timer.h> #include <asm/immap.h>
arch/m68k/lib/interrupts.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <irq_legacy.h> #include <watchdog.h> #include <asm/processor.h> #include <asm/immap.h>
arch/m68k/lib/time.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <irq_legacy.h> #include <time.h> #include <asm/timer.h>
arch/microblaze/cpu/interrupts.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <command.h> #include <fdtdec.h> +#include <irq_legacy.h> #include <malloc.h> #include <asm/microblaze_intc.h> #include <asm/asm.h>
arch/mips/cpu/interrupts.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> int interrupt_init (void ) {
arch/mips/mach-jz47xx/jz4780/timer.c +1 -0
@@ -9,6 +9,7 @@#include <config.h> #include <common.h> #include <div64.h> +#include <irq_legacy.h> #include <time.h> #include <asm/io.h> #include <asm/mipsregs.h>
arch/nds32/cpu/n1213/ag101/timer.c +1 -0
@@ -9,6 +9,7 @@*/ #ifndef CONFIG_TIMER #include <common.h> +#include <irq_legacy.h> #include <time.h> #include <asm/io.h> #include <faraday/fttmr010.h>
arch/nds32/lib/interrupts.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <irq_legacy.h> #include <asm/ptrace.h> #include <asm/system.h> #undef INTERRUPT_MODE
arch/nios2/cpu/interrupts.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <command.h> +#include <irq_legacy.h> #include <asm/nios2.h> #include <asm/types.h> #include <asm/io.h>
arch/powerpc/cpu/mpc83xx/interrupts.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <command.h> +#include <irq_legacy.h> #include <mpc83xx.h> #include <asm/processor.h>
arch/powerpc/cpu/mpc85xx/interrupts.c +1 -0
@@ -11,6 +11,7 @@*/ #include <common.h> +#include <irq_legacy.h> #include <watchdog.h> #include <command.h> #include <asm/processor.h>
arch/powerpc/cpu/mpc85xx/traps.c +1 -0
@@ -21,6 +21,7 @@#include <common.h> #include <command.h> +#include <irq_legacy.h> #include <kgdb.h> #include <asm/processor.h>
arch/powerpc/cpu/mpc86xx/interrupts.c +1 -0
@@ -15,6 +15,7 @@*/ #include <common.h> +#include <irq_legacy.h> #include <mpc86xx.h> #include <command.h> #include <asm/processor.h>
arch/powerpc/cpu/mpc8xx/interrupts.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> #include <mpc8xx.h> #include <mpc8xx_irq.h> #include <asm/cpm_8xx.h>
arch/powerpc/lib/interrupts.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <irq_legacy.h> #include <asm/processor.h> #include <watchdog.h> #ifdef CONFIG_LED_STATUS
arch/riscv/lib/interrupts.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <irq_legacy.h> #include <asm/ptrace.h> #include <asm/system.h> #include <asm/encoding.h>
arch/sandbox/lib/interrupts.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <irq_legacy.h> int interrupt_init (void ) {
arch/sh/cpu/sh4/interrupts.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> int interrupt_init (void ) {
arch/x86/cpu/i386/interrupt.c +1 -0
@@ -13,6 +13,7 @@#include <common.h> #include <dm.h> #include <efi_loader.h> +#include <irq_legacy.h> #include <asm/control_regs.h> #include <asm/i8259.h> #include <asm/interrupt.h>
arch/x86/cpu/x86_64/interrupts.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> #include <asm/processor-flags.h> void enable_interrupts (void )
arch/x86/lib/bios.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> #include <bios_emul.h> +#include <irq_legacy.h> #include <vbe.h> #include <linux/linkage.h> #include <asm/cache.h>
arch/x86/lib/interrupts.c +1 -0
@@ -30,6 +30,7 @@*/ #include <common.h> +#include <irq_legacy.h> #include <asm/interrupt.h> #if !CONFIG_IS_ENABLED (X86_64 )
arch/x86/lib/spl.c +1 -0
@@ -7,6 +7,7 @@#include <cpu_legacy.h> #include <debug_uart.h> #include <dm.h> +#include <irq_legacy.h> #include <malloc.h> #include <spl.h> #include <syscon.h>
arch/xtensa/cpu/exceptions.c +1 -0
@@ -12,6 +12,7 @@#include <common.h> #include <command.h> +#include <irq_legacy.h> #include <asm/string.h> #include <asm/regs.h>
common/board_r.c +1 -0
@@ -28,6 +28,7 @@#if defined(CONFIG_CMD_KGDB )#include <kgdb.h> #endif +#include <irq_legacy.h> #include <malloc.h> #include <mapmem.h> #ifdef CONFIG_BITBANGMII
common/spl/spl.c +1 -0
@@ -11,6 +11,7 @@#include <binman_sym.h> #include <dm.h> #include <handoff.h> +#include <irq_legacy.h> #include <serial.h> #include <spl.h> #include <asm/u-boot.h>
drivers/mtd/cfi_flash.c +1 -0
@@ -22,6 +22,7 @@#include <env.h> #include <errno.h> #include <fdt_support.h> +#include <irq_legacy.h> #include <asm/processor.h> #include <asm/io.h> #include <asm/byteorder.h>
drivers/timer/mpc83xx_timer.c +1 -0
@@ -8,6 +8,7 @@#include <board.h> #include <clk.h> #include <dm.h> +#include <irq_legacy.h> #include <status_led.h> #include <time.h> #include <timer.h>
include/common.h +0 -7
@@ -208,13 +208,6 @@ ulong get_bus_freq (ulong);int get_serial_clock (void );/* $(CPU)/interrupts.c */ -int interrupt_init (void ); -void timer_interrupt (struct pt_regs *); -void external_interrupt (struct pt_regs *); -void irq_install_handler (int ,interrupt_handler_t *,void *); -void irq_free_handler (int ); -void reset_timer (void ); -void enable_interrupts (void );int disable_interrupts (void );
include/exports.h +2 -0
@@ -1,6 +1,8 @@#ifndef __EXPORTS_H__#define __EXPORTS_H__ +#include <irq_legacy.h> +#ifndef __ASSEMBLY__#ifdef CONFIG_PHY_AQUANTIA #include <env.h>
include/irq_legacy.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* (C) Copyright 2000-2009 +* Wolfgang Denk, DENX Software Engineering, wd at denx.de. +*/ + +#ifndef __IRQ_LEGACY_H +#define __IRQ_LEGACY_H + +int interrupt_init (void ); +void timer_interrupt (struct pt_regs *regs); +void external_interrupt (struct pt_regs *regs); +void irq_install_handler (int vec,interrupt_handler_t *handler,void *arg); +void irq_free_handler (int vec); +void reset_timer (void ); + +#endif
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 32/41 common: Move interrupt functions into a new header
Quoted 4 lines · Simon Glass
These functions do not use driver model but are fairly widely used in U-Boot. Move them to a new
irq_legacy.hheader file.Signed-off-by Simon Glass <[email protected]>
I'm still weighing what I want to say about cpu_legacy.h but I feel like for irq_legancy.h we're getting ahead of ourselves. What is the DM model for this? Why do we need it? I didn't dig in to every function but it looks like we have a mix of U-Boot ABI functions and exception handlers. That stuff must be very lean. 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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/7232ca22/attachment.sig>
PATCH v2 32/41 common: Move interrupt functions into a new header
Hi Tom,
Quoted 6 lines · Tom Rini
Quoted 3 lines · Simon Glass
These functions do not use driver model but are fairly widely used in U-Boot. Move them to a new
irq_legacy.hheader file.
Quoted 7 lines
Quoted 1 line
Signed-off-by Simon Glass <[email protected]>I'm still weighing what I want to say about
cpu_legacy.hbut I feel like forirq_legancy.hwe're getting ahead of ourselves. What is the DM model for this? Why do we need it? I didn't dig in to every function but it looks like we have a mix of U-Boot ABI functions and exception handlers. That stuff must be very lean. Thanks!
Yes fair enough.
We have had an IRQ uclass for a while but it is not widely used (just on x86 and only for probing). I don't want to call this irq.h since it is so common, so I'll rename to irq_funcs.h I think.
Regards,
Simon
PATCH v2 32/41 common: Move interrupt functions into a new header
Quoted 17 lines · Simon Glass
Hi Tom,
Quoted 6 lines · Tom Rini
Quoted 3 lines · Simon Glass
These functions do not use driver model but are fairly widely used in U-Boot. Move them to a new
irq_legacy.hheader file.Quoted 7 lines
Quoted 1 line
Signed-off-by Simon Glass <[email protected]>I'm still weighing what I want to say about
cpu_legacy.hbut I feel like forirq_legancy.hwe're getting ahead of ourselves. What is the DM model for this? Why do we need it? I didn't dig in to every function but it looks like we have a mix of U-Boot ABI functions and exception handlers. That stuff must be very lean. Thanks!
Quoted 5 lines
Yes fair enough.
We have had an IRQ uclass for a while but it is not widely used (just on x86 and only for probing). I don't want to call this
irq.hsince it is so common, so I'll rename toirq_funcs.hI think.
Works for me, 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: <http://lists.denx.de/pipermail/u-boot/attachments/20191112/9aefb6dc/attachment.sig>
PATCH v2 33/41 common: Move enable/disable_interrupts out of common.h
In reply to Simon GlassMove these two functions into the irq_legacy.h header file. Also move interrupt_handler_t as this is used by the irq_install_handler() function.
---
Changes in v2: None
arch/arc/lib/bootm.c | 1 + arch/arm/cpu/arm11/cpu.c | 1 + arch/arm/cpu/arm920t/cpu.c | 1 + arch/arm/cpu/arm926ejs/cpu.c | 1 + arch/arm/cpu/arm946es/cpu.c | 1 + arch/arm/cpu/armv7/cpu.c | 1 + arch/arm/cpu/armv7m/cpu.c | 1 + arch/arm/cpu/armv8/cpu.c | 1 + arch/arm/cpu/pxa/pxa2xx.c | 1 + arch/arm/cpu/sa1100/cpu.c | 1 + arch/arm/lib/reset.c | 1 + arch/arm/mach-tegra/cmd_enterrcm.c | 1 + arch/microblaze/include/asm/microblaze_intc.h | 2 ++ arch/nds32/cpu/n1213/ag101/cpu.c | 1 + arch/nios2/cpu/cpu.c | 1 + arch/nios2/lib/bootm.c | 1 + arch/powerpc/cpu/mpc83xx/cpu.c | 1 + arch/powerpc/cpu/mpc83xx/ecc.c | 1 + arch/powerpc/cpu/mpc85xx/cpu.c | 1 + arch/riscv/cpu/generic/cpu.c | 1 + arch/sh/cpu/sh4/cpu.c | 1 + arch/sh/lib/zimageboot.c | 1 + arch/x86/lib/zimage.c | 1 + board/bosch/shc/board.c | 1 + board/cobra5272/flash.c | 1 + board/freescale/b4860qds/b4860qds.c | 1 + board/freescale/common/vid.c | 1 + board/freescale/m5253demo/flash.c | 1 + board/freescale/t4qds/t4240qds.c | 1 + board/synopsys/hsdk/hsdk.c | 1 + cmd/booti.c | 1 + cmd/bootz.c | 1 + cmd/fdc.c | 1 + cmd/irq.c | 1 + common/board_r.c | 1 + common/bootm.c | 1 + drivers/firmware/psci.c | 1 + drivers/mtd/pic32_flash.c | 1 + include/common.h | 6 ------ include/exports.h | 2 ++ include/irq_legacy.h | 9 ++++++++- lib/efi_loader/efi_boottime.c | 1 + post/cpu/mpc83xx/ecc.c | 1 + post/lib_powerpc/andi.c | 1 + post/lib_powerpc/b.c | 1 + post/lib_powerpc/cmp.c | 1 + post/lib_powerpc/cmpi.c | 1 + post/lib_powerpc/complex.c | 1 + post/lib_powerpc/cr.c | 1 + post/lib_powerpc/load.c | 1 + post/lib_powerpc/multi.c | 1 + post/lib_powerpc/rlwimi.c | 1 + post/lib_powerpc/rlwinm.c | 1 + post/lib_powerpc/rlwnm.c | 1 + post/lib_powerpc/srawi.c | 1 + post/lib_powerpc/store.c | 1 + post/lib_powerpc/string.c | 1 + post/lib_powerpc/three.c | 1 + post/lib_powerpc/threei.c | 1 + post/lib_powerpc/threex.c | 1 + post/lib_powerpc/two.c | 1 + post/lib_powerpc/twox.c | 1 + 62 files changed, 70 insertions(+), 7 deletions(-)
arch/arc/lib/bootm.c +1 -0
@@ -3,6 +3,7 @@* Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ +#include <irq_legacy.h> #include <asm/cache.h> #include <common.h>
arch/arm/cpu/arm11/cpu.c +1 -0
@@ -17,6 +17,7 @@#include <common.h> #include <command.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #include <asm/system.h> static void cache_flush (void );
arch/arm/cpu/arm920t/cpu.c +1 -0
@@ -15,6 +15,7 @@#include <common.h> #include <command.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #include <asm/system.h> static void cache_flush (void );
arch/arm/cpu/arm926ejs/cpu.c +1 -0
@@ -15,6 +15,7 @@#include <common.h> #include <command.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #include <asm/system.h> static void cache_flush (void );
arch/arm/cpu/arm946es/cpu.c +1 -0
@@ -15,6 +15,7 @@#include <common.h> #include <command.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #include <asm/system.h> #include <asm/io.h>
arch/arm/cpu/armv7/cpu.c +1 -0
@@ -17,6 +17,7 @@#include <common.h> #include <command.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #include <asm/system.h> #include <asm/cache.h> #include <asm/armv7.h>
arch/arm/cpu/armv7m/cpu.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #include <asm/io.h> #include <asm/armv7m.h>
arch/arm/cpu/armv8/cpu.c +1 -0
@@ -13,6 +13,7 @@#include <common.h> #include <command.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #include <asm/system.h> #include <asm/secure.h> #include <linux/compiler.h>
arch/arm/cpu/pxa/pxa2xx.c +1 -0
@@ -11,6 +11,7 @@#include <common.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #include <time.h> #include <asm/arch/pxa-regs.h> #include <asm/io.h>
arch/arm/cpu/sa1100/cpu.c +1 -0
@@ -16,6 +16,7 @@#include <common.h> #include <command.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #include <asm/system.h> #include <asm/io.h>
arch/arm/lib/reset.c +1 -0
@@ -21,6 +21,7 @@*/ #include <common.h> +#include <irq_legacy.h> __weak void reset_misc (void ) {
arch/arm/mach-tegra/cmd_enterrcm.c +1 -0
@@ -25,6 +25,7 @@*/ #include <common.h> +#include <irq_legacy.h> #include <asm/arch/tegra.h> #include <asm/arch-tegra/pmc.h>
arch/microblaze/include/asm/microblaze_intc.h +2 -0
@@ -5,6 +5,8 @@* Michal SIMEK <[email protected]> */ +#include <irq_legacy.h> + typedef volatile struct microblaze_intc_t { int isr; /* interrupt status register */ int ipr; /* interrupt pending register */
arch/nds32/cpu/n1213/ag101/cpu.c +1 -0
@@ -16,6 +16,7 @@#include <common.h> #include <command.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #include <watchdog.h> #include <asm/cache.h>
arch/nios2/cpu/cpu.c +1 -0
@@ -9,6 +9,7 @@#include <cpu_legacy.h> #include <dm.h> #include <errno.h> +#include <irq_legacy.h> #include <asm/cache.h> DECLARE_GLOBAL_DATA_PTR ;
arch/nios2/lib/bootm.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #define NIOS_MAGIC 0x534f494e/* enable command line and initrd passing */
arch/powerpc/cpu/mpc83xx/cpu.c +1 -0
@@ -11,6 +11,7 @@#include <common.h> #include <cpu.h> +#include <irq_legacy.h> #include <vsprintf.h> #include <watchdog.h> #include <command.h>
arch/powerpc/cpu/mpc83xx/ecc.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <irq_legacy.h> #include <mpc83xx.h> #include <command.h>
arch/powerpc/cpu/mpc85xx/cpu.c +1 -0
@@ -11,6 +11,7 @@#include <config.h> #include <common.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #include <vsprintf.h> #include <watchdog.h> #include <command.h>
arch/riscv/cpu/generic/cpu.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <dm.h> +#include <irq_legacy.h> /* * cleanup_before_linux() is called just before we call linux
arch/sh/cpu/sh4/cpu.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <command.h> #include <cpu.h> +#include <irq_legacy.h> #include <netdev.h> #include <asm/processor.h>
arch/sh/lib/zimageboot.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <irq_legacy.h> #include <asm/io.h> #include <asm/zimage.h>
arch/x86/lib/zimage.c +1 -0
@@ -14,6 +14,7 @@#include <common.h> #include <env.h> +#include <irq_legacy.h> #include <malloc.h> #include <asm/acpi_table.h> #include <asm/io.h>
board/bosch/shc/board.c +1 -0
@@ -14,6 +14,7 @@#include <common.h> #include <env.h> #include <errno.h> +#include <irq_legacy.h> #include <spl.h> #include <asm/arch/cpu.h> #include <asm/arch/hardware.h>
board/cobra5272/flash.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <console.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #define PHYS_FLASH_1 CONFIG_SYS_FLASH_BASE#define FLASH_BANK_SIZE 0x200000
board/freescale/b4860qds/b4860qds.c +1 -0
@@ -7,6 +7,7 @@#include <command.h> #include <env.h> #include <i2c.h> +#include <irq_legacy.h> #include <netdev.h> #include <linux/compiler.h> #include <asm/mmu.h>
board/freescale/common/vid.c +1 -0
@@ -7,6 +7,7 @@#include <command.h> #include <env.h> #include <i2c.h> +#include <irq_legacy.h> #include <asm/io.h> #ifdef CONFIG_FSL_LSCH2 #include <asm/arch/immap_lsch2.h>
board/freescale/m5253demo/flash.c +1 -0
@@ -8,6 +8,7 @@*/ #include <common.h> +#include <irq_legacy.h> #include <asm/immap.h>
board/freescale/t4qds/t4240qds.c +1 -0
@@ -7,6 +7,7 @@#include <command.h> #include <env.h> #include <i2c.h> +#include <irq_legacy.h> #include <netdev.h> #include <linux/compiler.h> #include <asm/mmu.h>
board/synopsys/hsdk/hsdk.c +1 -0
@@ -8,6 +8,7 @@#include <config.h> #include <cpu_legacy.h> #include <env.h> +#include <irq_legacy.h> #include <linux/printk.h> #include <linux/kernel.h> #include <linux/io.h>
cmd/booti.c +1 -0
@@ -8,6 +8,7 @@#include <bootm.h> #include <command.h> #include <image.h> +#include <irq_legacy.h> #include <lmb.h> #include <mapmem.h> #include <linux/kernel.h>
cmd/bootz.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <bootm.h> #include <command.h> +#include <irq_legacy.h> #include <lmb.h> #include <linux/compiler.h>
cmd/fdc.c +1 -0
@@ -11,6 +11,7 @@#include <config.h> #include <command.h> #include <image.h> +#include <irq_legacy.h> #undef FDC_DEBUG
cmd/irq.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <config.h> #include <command.h> +#include <irq_legacy.h> static int do_interrupts (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[])
common/board_r.c +1 -0
@@ -12,6 +12,7 @@#include <common.h> #include <api.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #include <u-boot/crc.h> /* TODO: can we just include all these headers whether needed or not? */ #if defined(CONFIG_CMD_BEDBUG )
common/bootm.c +1 -0
@@ -11,6 +11,7 @@#include <env.h> #include <errno.h> #include <fdt_support.h> +#include <irq_legacy.h> #include <lmb.h> #include <malloc.h> #include <mapmem.h>
drivers/firmware/psci.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <dm.h> +#include <irq_legacy.h> #include <dm/lists.h> #include <efi_loader.h> #include <linux/libfdt.h>
drivers/mtd/pic32_flash.c +1 -0
@@ -10,6 +10,7 @@#include <dm.h> #include <fdt_support.h> #include <flash.h> +#include <irq_legacy.h> #include <mach/pic32.h> #include <wait_bit.h>
include/common.h +0 -6
@@ -46,8 +46,6 @@ typedef volatile unsigned char vu_char;#include <log.h> -typedef void (interrupt_handler_t )(void *); -#include <asm/u-boot.h> /* boot information for Linux kernel */ #include <asm/global_data.h> /* global data used for startup functions */
@@ -207,10 +205,6 @@ int get_clocks (void);ulong get_bus_freq (ulong );int get_serial_clock (void ); -/* $(CPU)/interrupts.c */ -void enable_interrupts (void ); -int disable_interrupts (void ); -/* lib/uuid.c */ #include <uuid.h>
include/exports.h +2 -0
@@ -9,6 +9,8 @@#include <phy_interface.h> #endif +#include <irq_legacy.h> +struct spi_slave ;/* These are declarations of exported functions available in C code */
include/irq_legacy.h +8 -1
@@ -7,11 +7,18 @@#ifndef __IRQ_LEGACY_H#define __IRQ_LEGACY_H +struct pt_regs ; + +typedef void (interrupt_handler_t )(void *arg); +int interrupt_init (void );void timer_interrupt (struct pt_regs *regs);void external_interrupt (struct pt_regs *regs); -void irq_install_handler (int vec,interrupt_handler_t *handler,void *arg); +void irq_install_handler (int vec,interrupt_handler_t *handler,void *arg);void irq_free_handler (int vec);void reset_timer (void ); +void enable_interrupts (void ); +int disable_interrupts (void ); +#endif
lib/efi_loader/efi_boottime.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <div64.h> #include <efi_loader.h> +#include <irq_legacy.h> #include <malloc.h> #include <time.h> #include <linux/libfdt_env.h>
post/cpu/mpc83xx/ecc.c +1 -0
@@ -11,6 +11,7 @@#include <common.h> #include <cpu_legacy.h> #include <irq_legacy.h> +#include <irq_legacy.h> #include <mpc83xx.h> #include <watchdog.h> #include <asm/io.h>
post/lib_powerpc/andi.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> /* * CPU test
post/lib_powerpc/b.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> /* * CPU test
post/lib_powerpc/cmp.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> /* * CPU test
post/lib_powerpc/cmpi.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> /* * CPU test
post/lib_powerpc/complex.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> /* * CPU test
post/lib_powerpc/cr.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> /* * CPU test
post/lib_powerpc/load.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> /* * CPU test
post/lib_powerpc/multi.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> /* * CPU test
post/lib_powerpc/rlwimi.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> /* * CPU test
post/lib_powerpc/rlwinm.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> /* * CPU test
post/lib_powerpc/rlwnm.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> /* * CPU test
post/lib_powerpc/srawi.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> /* * CPU test
post/lib_powerpc/store.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> /* * CPU test
post/lib_powerpc/string.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> /* * CPU test
post/lib_powerpc/three.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> /* * CPU test
post/lib_powerpc/threei.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> /* * CPU test
post/lib_powerpc/threex.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> /* * CPU test
post/lib_powerpc/two.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> /* * CPU test
post/lib_powerpc/twox.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <irq_legacy.h> /* * CPU test
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
PATCH v2 33/41 common: Move enable/disable_interrupts out of common.h
Quoted 5 lines · Simon Glass
Move these two functions into the
irq_legacy.hheader file. Also moveinterrupt_handler_tas this is used by theirq_install_handler()function.Signed-off-by Simon Glass <[email protected]>
Conceptually, whatever we do with irq functions, these should be moved there as well, agreed.
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: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/82d0c6d7/attachment.sig>