This series adds better support of booting VxWorks using 'bootvx'.
Tested by booting a VxWorks 6.9.4 kernel on Intel Crown Bay, and a VxWorks 7 kernel on Intel Galileo.
Note:
Patch#1 and patch#2 are recommended to be included in v2015.10 release, other patches in this series can target for next release.
http://patchwork.ozlabs.org/patch/522185/ was a single patch previously, now is included in this v2 series as it fixed a bug which could prevent VxWorks from booting.
Changes in v2: - New patch to move install_e820_map() out of zimage.c - New patch to remove quotation mark in CONFIG_HOSTNAME - Split the defconfig reorder to another patch, making this patch as CONFIG_CMD_ELF mods only - Update sparc and avr32 boards to unset CONFIG_CMD_ELF - Fix the endian issue for netmask - New patch to add asmlinkage to the VxWorks x86 entry - Describe typical values for bootaddr, e820data, e820info.
Bin Meng (13): Reorder defconfigs with 'savedefconfig' x86: fsp: Report correct number of E820 table entries x86: Initialize GDT entry 1 to be the 32-bit CS as well x86: Move install_e820_map() out of zimage.c x86: Remove quotation mark in CONFIG_HOSTNAME cmd: Convert CONFIG_CMD_ELF to Kconfig cmd: Clean up cmd_elf a little bit cmd: elf: Reorder load_elf_image_phdr() and load_elf_image_shdr() cmd: bootvx: Pass netmask and gatewayip to VxWorks bootline cmd: bootvx: Always get VxWorks bootline from env cmd: bootvx: Pass E820 information to an x86 VxWorks kernel cmd: bootvx: Add asmlinkage to the VxWorks x86 entry doc: Complement document about booting VxWorks
README | 12 +- arch/x86/cpu/cpu.c | 7 +- arch/x86/include/asm/e820.h | 3 + arch/x86/include/asm/zimage.h | 3 - arch/x86/lib/Makefile | 1 + arch/x86/lib/e820.c | 37 +++ arch/x86/lib/fsp/fsp_dram.c | 3 +- arch/x86/lib/zimage.c | 26 -- common/Kconfig | 6 + common/cmd_elf.c | 411 +++++++++++++----------- configs/A10-OLinuXino-Lime_defconfig | 2 +- configs/Bananapi_defconfig | 2 +- configs/Bananapro_defconfig | 2 +- configs/Chuwi_V7_CW0825_defconfig | 2 +- configs/M5208EVBE_defconfig | 2 +- configs/M52277EVB_defconfig | 2 +- configs/M5235EVB_defconfig | 2 +- configs/M5272C3_defconfig | 2 +- configs/M5275EVB_defconfig | 2 +- configs/M5282EVB_defconfig | 2 +- configs/M53017EVB_defconfig | 2 +- configs/M5329AFEE_defconfig | 2 +- configs/M5329BFEE_defconfig | 2 +- configs/M5373EVB_defconfig | 2 +- configs/M54418TWR_defconfig | 2 +- configs/M54418TWR_nand_mii_defconfig | 2 +- configs/M54418TWR_nand_rmii_defconfig | 2 +- configs/M54418TWR_nand_rmii_lowfreq_defconfig | 2 +- configs/M54418TWR_serial_mii_defconfig | 2 +- configs/M54418TWR_serial_rmii_defconfig | 2 +- configs/M54451EVB_defconfig | 2 +- configs/M54455EVB_defconfig | 2 +- configs/M5475AFE_defconfig | 2 +- configs/M5475BFE_defconfig | 2 +- configs/M5475CFE_defconfig | 2 +- configs/M5475DFE_defconfig | 2 +- configs/M5475EFE_defconfig | 2 +- configs/M5475FFE_defconfig | 2 +- configs/M5475GFE_defconfig | 2 +- configs/M5485AFE_defconfig | 2 +- configs/M5485BFE_defconfig | 2 +- configs/M5485CFE_defconfig | 2 +- configs/M5485DFE_defconfig | 2 +- configs/M5485EFE_defconfig | 2 +- configs/M5485FFE_defconfig | 2 +- configs/M5485GFE_defconfig | 2 +- configs/M5485HFE_defconfig | 2 +- configs/MPC8349ITXGP_defconfig | 2 +- configs/MPC8349ITX_LOWBOOT_defconfig | 2 +- configs/MPC8349ITX_defconfig | 2 +- configs/MSI_Primo81_defconfig | 2 +- configs/Mini-X_defconfig | 2 +- configs/PATI_defconfig | 2 +- configs/UCP1020_defconfig | 2 +- configs/VCMA9_defconfig | 2 +- configs/Wexler_TAB7200_defconfig | 2 +- configs/ac14xx_defconfig | 2 +- configs/adp-ag101p_defconfig | 2 +- configs/alt_defconfig | 2 +- configs/am335x_boneblack_defconfig | 2 +- configs/am335x_gp_evm_defconfig | 1 - configs/am335x_sl50_defconfig | 1 - configs/am3517_crane_defconfig | 2 +- configs/am3517_evm_defconfig | 2 +- configs/amcore_defconfig | 2 +- configs/apalis_t30_defconfig | 4 +- configs/apf27_defconfig | 2 +- configs/arcangel4-be_defconfig | 2 +- configs/arcangel4_defconfig | 4 +- configs/arndale_defconfig | 4 +- configs/astro_mcf5373l_defconfig | 2 +- configs/at91rm9200ek_defconfig | 2 +- configs/at91rm9200ek_ram_defconfig | 2 +- configs/at91sam9260ek_dataflash_cs0_defconfig | 2 +- configs/at91sam9260ek_dataflash_cs1_defconfig | 2 +- configs/at91sam9260ek_nandflash_defconfig | 2 +- configs/at91sam9261ek_dataflash_cs0_defconfig | 2 +- configs/at91sam9261ek_dataflash_cs3_defconfig | 2 +- configs/at91sam9261ek_nandflash_defconfig | 2 +- configs/at91sam9263ek_dataflash_cs0_defconfig | 2 +- configs/at91sam9263ek_dataflash_defconfig | 2 +- configs/at91sam9263ek_nandflash_defconfig | 2 +- configs/at91sam9263ek_norflash_boot_defconfig | 2 +- configs/at91sam9263ek_norflash_defconfig | 2 +- configs/at91sam9g10ek_dataflash_cs0_defconfig | 2 +- configs/at91sam9g10ek_dataflash_cs3_defconfig | 2 +- configs/at91sam9g10ek_nandflash_defconfig | 2 +- configs/at91sam9g20ek_2mmc_defconfig | 2 +- configs/at91sam9g20ek_2mmc_nandflash_defconfig | 2 +- configs/at91sam9g20ek_dataflash_cs0_defconfig | 2 +- configs/at91sam9g20ek_dataflash_cs1_defconfig | 2 +- configs/at91sam9g20ek_nandflash_defconfig | 2 +- configs/at91sam9m10g45ek_mmc_defconfig | 2 +- configs/at91sam9m10g45ek_nandflash_defconfig | 2 +- configs/at91sam9n12ek_mmc_defconfig | 2 +- configs/at91sam9n12ek_nandflash_defconfig | 2 +- configs/at91sam9n12ek_spiflash_defconfig | 2 +- configs/at91sam9rlek_dataflash_defconfig | 2 +- configs/at91sam9rlek_mmc_defconfig | 2 +- configs/at91sam9rlek_nandflash_defconfig | 2 +- configs/at91sam9x5ek_dataflash_defconfig | 2 +- configs/at91sam9x5ek_mmc_defconfig | 2 +- configs/at91sam9x5ek_nandflash_defconfig | 2 +- configs/at91sam9x5ek_spiflash_defconfig | 2 +- configs/at91sam9xeek_dataflash_cs0_defconfig | 2 +- configs/at91sam9xeek_dataflash_cs1_defconfig | 2 +- configs/at91sam9xeek_nandflash_defconfig | 2 +- configs/atngw100_defconfig | 3 +- configs/atngw100mkii_defconfig | 3 +- configs/atstk1002_defconfig | 3 +- configs/bayleybay_defconfig | 8 +- configs/beaver_defconfig | 4 +- configs/bf537-minotaur_defconfig | 2 +- configs/bf537-srv1_defconfig | 2 +- configs/bf561-acvilon_defconfig | 2 +- configs/br4_defconfig | 2 +- configs/cairo_defconfig | 2 +- configs/calimain_defconfig | 2 +- configs/cardhu_defconfig | 4 +- configs/cgtqmx6qeval_defconfig | 2 +- configs/chromebook_jerry_defconfig | 24 +- configs/chromebook_link_defconfig | 6 +- configs/chromebox_panther_defconfig | 6 +- configs/cm_fx6_defconfig | 2 +- configs/cm_t335_defconfig | 2 +- configs/cm_t3517_defconfig | 2 +- configs/cm_t35_defconfig | 2 +- configs/cm_t43_defconfig | 4 +- configs/cm_t54_defconfig | 2 +- configs/cobra5272_defconfig | 2 +- configs/colibri_t20_defconfig | 4 +- configs/colibri_t30_defconfig | 4 +- configs/colibri_vf_defconfig | 2 +- configs/colibri_vf_dtb_defconfig | 2 +- configs/coreboot-x86_defconfig | 4 +- configs/corvus_defconfig | 2 +- configs/crownbay_defconfig | 8 +- configs/da830evm_defconfig | 2 +- configs/da850evm_defconfig | 2 +- configs/da850evm_direct_nor_defconfig | 2 +- configs/dalmore_defconfig | 4 +- configs/dbau1000_defconfig | 3 +- configs/dbau1100_defconfig | 3 +- configs/dbau1500_defconfig | 3 +- configs/dbau1550_defconfig | 3 +- configs/dbau1550_el_defconfig | 3 +- configs/devkit3250_defconfig | 2 +- configs/dlvision-10g_defconfig | 1 + configs/dlvision_defconfig | 1 + configs/dockstar_defconfig | 2 +- configs/dra72_evm_defconfig | 3 +- configs/draco_defconfig | 2 +- configs/duovero_defconfig | 2 +- configs/e2220-1170_defconfig | 3 - configs/ea20_defconfig | 2 +- configs/eb_cpu5282_defconfig | 2 +- configs/eco5pk_defconfig | 2 +- configs/edminiv2_defconfig | 2 +- configs/ethernut5_defconfig | 2 +- configs/firefly-rk3288_defconfig | 24 +- configs/flea3_defconfig | 2 +- configs/fx12mm_defconfig | 2 +- configs/goflexhome_defconfig | 2 +- configs/gose_defconfig | 2 +- configs/gr_cpci_ax2000_defconfig | 1 + configs/gr_ep2s60_defconfig | 1 + configs/gr_xc3s_1500_defconfig | 1 + configs/grasshopper_defconfig | 3 +- configs/grsim_defconfig | 1 + configs/grsim_leon2_defconfig | 1 + configs/gt90h_v4_defconfig | 2 +- configs/gwventana_defconfig | 4 +- configs/h2200_defconfig | 2 +- configs/harmony_defconfig | 4 +- configs/hikey_defconfig | 3 - configs/ib62x0_defconfig | 2 +- configs/iconnect_defconfig | 2 +- configs/imx31_phycore_defconfig | 2 +- configs/inet97fv2_defconfig | 2 +- configs/inet98v_rev2_defconfig | 2 +- configs/inet9f_rev03_defconfig | 2 +- configs/integratorap_cm720t_defconfig | 2 +- configs/integratorap_cm920t_defconfig | 2 +- configs/integratorap_cm926ejs_defconfig | 2 +- configs/integratorap_cm946es_defconfig | 2 +- configs/integratorcp_cm1136_defconfig | 2 +- configs/integratorcp_cm920t_defconfig | 2 +- configs/integratorcp_cm926ejs_defconfig | 2 +- configs/integratorcp_cm946es_defconfig | 2 +- configs/io_defconfig | 1 + configs/iocon_defconfig | 1 + configs/ipam390_defconfig | 2 +- configs/jesurun_q5_defconfig | 2 +- configs/jetson-tk1_defconfig | 4 +- configs/k2e_evm_defconfig | 2 +- configs/k2hk_evm_defconfig | 2 +- configs/k2l_evm_defconfig | 2 +- configs/koelsch_defconfig | 2 +- configs/kwb_defconfig | 2 +- configs/kzm9g_defconfig | 2 +- configs/lager_defconfig | 2 +- configs/ls1021aqds_qspi_defconfig | 2 +- configs/ls1021atwr_qspi_defconfig | 2 +- configs/ls2085aqds_defconfig | 6 +- configs/ls2085ardb_defconfig | 6 +- configs/mcx_defconfig | 2 +- configs/medcom-wide_defconfig | 4 +- configs/microblaze-generic_defconfig | 2 +- configs/minnowmax_defconfig | 8 +- configs/ml507_defconfig | 2 +- configs/mt_ventoux_defconfig | 2 +- configs/mx6ul_14x14_evk_defconfig | 7 +- configs/mx6ul_9x9_evk_defconfig | 5 +- configs/mx7dsabresd_defconfig | 11 +- configs/nas220_defconfig | 2 +- configs/neo_defconfig | 1 + configs/nokia_rx51_defconfig | 2 +- configs/nyan-big_defconfig | 16 +- configs/odroid-xu3_defconfig | 6 +- configs/odroid_defconfig | 4 +- configs/omap3_evm_defconfig | 2 +- configs/omap3_evm_quick_mmc_defconfig | 2 +- configs/omap3_evm_quick_nand_defconfig | 2 +- configs/omap3_logic_defconfig | 2 +- configs/omap3_overo_defconfig | 2 +- configs/omap3_pandora_defconfig | 2 +- configs/omapl138_lcdk_defconfig | 2 +- configs/origen_defconfig | 2 +- configs/p2371-0000_defconfig | 2 - configs/p2571_defconfig | 2 - configs/paz00_defconfig | 4 +- configs/pb1000_defconfig | 3 +- configs/pcm030_defconfig | 2 +- configs/peach-pi_defconfig | 22 +- configs/peach-pit_defconfig | 22 +- configs/pepper_defconfig | 2 +- configs/platinum_picon_defconfig | 2 +- configs/platinum_titanium_defconfig | 2 +- configs/plutux_defconfig | 4 +- configs/pm9261_defconfig | 2 +- configs/pm9263_defconfig | 2 +- configs/pm9g45_defconfig | 2 +- configs/pogo_e02_defconfig | 2 +- configs/porter_defconfig | 2 +- configs/pov_protab2_ips9_defconfig | 2 +- configs/pr1_defconfig | 2 +- configs/pxm2_defconfig | 2 +- configs/qemu-x86_defconfig | 2 +- configs/rastaban_defconfig | 2 +- configs/rpi_2_defconfig | 2 +- configs/rpi_defconfig | 2 +- configs/rut_defconfig | 2 +- configs/s5p_goni_defconfig | 2 +- configs/s5pc210_universal_defconfig | 2 +- configs/sandbox_defconfig | 33 +- configs/seaboard_defconfig | 4 +- configs/secomx6quq7_defconfig | 2 +- configs/silk_defconfig | 2 +- configs/smartweb_defconfig | 1 - configs/smdk2410_defconfig | 2 +- configs/smdk5250_defconfig | 8 +- configs/smdk5420_defconfig | 8 +- configs/smdkc100_defconfig | 2 +- configs/smdkv310_defconfig | 2 +- configs/snapper9260_defconfig | 2 +- configs/sniper_defconfig | 2 +- configs/snow_defconfig | 32 +- configs/socfpga_arria5_defconfig | 8 +- configs/socfpga_cyclone5_defconfig | 8 +- configs/socfpga_de0_nano_soc_defconfig | 18 +- configs/socfpga_mcvevk_defconfig | 19 +- configs/socfpga_sockit_defconfig | 24 +- configs/socfpga_socrates_defconfig | 8 +- configs/spring_defconfig | 30 +- configs/stm32f429-discovery_defconfig | 2 +- configs/stout_defconfig | 2 +- configs/stv0991_defconfig | 2 +- configs/tao3530_defconfig | 2 +- configs/taurus_defconfig | 2 +- configs/tb100_defconfig | 4 +- configs/tbs2910_defconfig | 2 +- configs/tec-ng_defconfig | 4 +- configs/tec_defconfig | 4 +- configs/thuban_defconfig | 2 +- configs/ti814x_evm_defconfig | 2 +- configs/ti816x_evm_defconfig | 2 +- configs/titanium_defconfig | 2 +- configs/trats2_defconfig | 2 +- configs/trats_defconfig | 2 +- configs/tricorder_defconfig | 2 +- configs/trimslice_defconfig | 4 +- configs/tseries_mmc_defconfig | 2 +- configs/tseries_nand_defconfig | 2 +- configs/tseries_spi_defconfig | 2 +- configs/twister_defconfig | 2 +- configs/udoo_defconfig | 6 +- configs/usb_a9263_dataflash_defconfig | 2 +- configs/v5fx30teval_defconfig | 2 +- configs/vct_platinum_defconfig | 2 +- configs/vct_platinum_onenand_defconfig | 2 +- configs/vct_platinum_onenand_small_defconfig | 3 +- configs/vct_platinum_small_defconfig | 3 +- configs/vct_platinumavc_defconfig | 2 +- configs/vct_platinumavc_onenand_defconfig | 2 +- configs/vct_platinumavc_onenand_small_defconfig | 3 +- configs/vct_platinumavc_small_defconfig | 3 +- configs/vct_premium_defconfig | 2 +- configs/vct_premium_onenand_defconfig | 2 +- configs/vct_premium_onenand_small_defconfig | 3 +- configs/vct_premium_small_defconfig | 3 +- configs/venice2_defconfig | 4 +- configs/ventana_defconfig | 4 +- configs/vexpress_aemv8a_juno_defconfig | 4 +- configs/vexpress_aemv8a_semi_defconfig | 4 +- configs/whistler_defconfig | 4 +- configs/wireless_space_defconfig | 1 - configs/woodburn_defconfig | 2 +- configs/woodburn_sd_defconfig | 2 +- configs/work_92105_defconfig | 2 +- configs/x600_defconfig | 2 +- configs/xilinx-ppc405-generic_defconfig | 2 +- configs/xilinx-ppc440-generic_defconfig | 2 +- configs/zmx25_defconfig | 2 +- configs/zynq_microzed_defconfig | 2 +- configs/zynq_zc702_defconfig | 2 +- configs/zynq_zc706_defconfig | 2 +- configs/zynq_zc70x_defconfig | 2 +- configs/zynq_zc770_xm010_defconfig | 2 +- configs/zynq_zc770_xm011_defconfig | 2 +- configs/zynq_zc770_xm012_defconfig | 2 +- configs/zynq_zc770_xm013_defconfig | 2 +- configs/zynq_zed_defconfig | 2 +- configs/zynq_zybo_defconfig | 2 +- doc/README.vxworks | 82 ++++- doc/README.x86 | 2 + include/config_cmd_all.h | 1 - include/config_distro_defaults.h | 1 - include/configs/B4860QDS.h | 1 - include/configs/BSC9131RDB.h | 1 - include/configs/BSC9132QDS.h | 1 - include/configs/C29XPCIE.h | 1 - include/configs/CPCI2DP.h | 1 - include/configs/CPCI4052.h | 1 - include/configs/M5208EVBE.h | 1 - include/configs/M52277EVB.h | 1 - include/configs/M5235EVB.h | 1 - include/configs/M5272C3.h | 1 - include/configs/M5275EVB.h | 1 - include/configs/M53017EVB.h | 1 - include/configs/M5329EVB.h | 1 - include/configs/M5373EVB.h | 1 - include/configs/M54418TWR.h | 1 - include/configs/M54451EVB.h | 1 - include/configs/M54455EVB.h | 1 - include/configs/M5475EVB.h | 1 - include/configs/M5485EVB.h | 1 - include/configs/MIP405.h | 1 - include/configs/MPC8536DS.h | 1 - include/configs/MPC8540ADS.h | 1 - include/configs/MPC8541CDS.h | 1 - include/configs/MPC8544DS.h | 1 - include/configs/MPC8548CDS.h | 1 - include/configs/MPC8555CDS.h | 1 - include/configs/MPC8560ADS.h | 1 - include/configs/MPC8568MDS.h | 1 - include/configs/MPC8569MDS.h | 1 - include/configs/MPC8572DS.h | 1 - include/configs/P1010RDB.h | 1 - include/configs/P1022DS.h | 1 - include/configs/P2041RDB.h | 1 - include/configs/PIP405.h | 1 - include/configs/PLU405.h | 1 - include/configs/PMC405DE.h | 1 - include/configs/PMC440.h | 1 - include/configs/T102xQDS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T1040QDS.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240RDB.h | 1 - include/configs/TQM823L.h | 1 - include/configs/TQM823M.h | 1 - include/configs/TQM850L.h | 1 - include/configs/TQM850M.h | 1 - include/configs/TQM855L.h | 1 - include/configs/TQM855M.h | 1 - include/configs/TQM860L.h | 1 - include/configs/TQM860M.h | 1 - include/configs/TQM862L.h | 1 - include/configs/TQM862M.h | 1 - include/configs/TQM866M.h | 1 - include/configs/UCP1020.h | 1 - include/configs/VCMA9.h | 1 - include/configs/VOM405.h | 1 - include/configs/amcc-common.h | 1 - include/configs/arcangel4.h | 1 - include/configs/astro_mcf5373l.h | 1 - include/configs/axs101.h | 1 - include/configs/bf537-minotaur.h | 1 - include/configs/bf537-srv1.h | 1 - include/configs/bfin_adi_common.h | 1 - include/configs/blackstamp.h | 1 - include/configs/blackvme.h | 1 - include/configs/controlcenterd.h | 1 - include/configs/corenet_ds.h | 1 - include/configs/dbau1x00.h | 1 - include/configs/digsy_mtc.h | 1 - include/configs/dlvision-10g.h | 1 - include/configs/dlvision.h | 1 - include/configs/io.h | 1 - include/configs/iocon.h | 1 - include/configs/km/km_arm.h | 1 - include/configs/lsxl.h | 1 - include/configs/malta.h | 1 - include/configs/mecp5123.h | 1 - include/configs/motionpro.h | 1 - include/configs/munices.h | 1 - include/configs/neo.h | 1 - include/configs/nitrogen6x.h | 1 - include/configs/openrisc-generic.h | 1 - include/configs/origen.h | 1 - include/configs/p1_p2_rdb_pc.h | 1 - include/configs/p1_twr.h | 1 - include/configs/pb1x00.h | 2 - include/configs/qemu-mips.h | 1 - include/configs/qemu-mips64.h | 1 - include/configs/qemu-ppce500.h | 1 - include/configs/sandbox.h | 1 - include/configs/sbc8548.h | 1 - include/configs/smdk2410.h | 1 - include/configs/smdkc100.h | 1 - include/configs/smdkv310.h | 1 - include/configs/t4qds.h | 1 - include/configs/tb100.h | 1 - include/configs/vct.h | 2 - include/configs/vme8349.h | 1 - include/configs/x86-common.h | 3 +- include/configs/xilinx-ppc.h | 1 - include/configs/xilinx_zynqmp.h | 1 - include/configs/xpedite1000.h | 1 - include/configs/xpedite517x.h | 1 - include/configs/xpedite520x.h | 1 - include/configs/xpedite537x.h | 1 - include/configs/xpedite550x.h | 1 - include/configs/zmx25.h | 1 - include/configs/zynq-common.h | 1 - include/vxworks.h | 51 +-- 448 files changed, 897 insertions(+), 899 deletions(-) create mode 100644 arch/x86/lib/e820.c