# HG changeset patch # User Mychaela Falconia # Date 1590719799 0 # Node ID 5f00e9afd5d9d7f9088c8e0f12bc959f9172ec09 # Parent def882d1b354a7322c696f8215a0d9ca57d9530a removing clutter: INIT_blob provision The lost init.c source was reconstructed from init.obj in 2017; prior to that reconstruction we were compiling main.lib from partial source: using the init module in blob form with various binary patches, but recompiling create_RVtasks.c from source so we could change RiViera SWE configuration. We've been using the fully reconstructed version of init.c since 2017, and now the old INIT_blob provision (which is not used by any config) is just extra noise in our targets/*.conf files. This commit removes all bits related to this provision, reducing clutter and making it easier to add new targets. diff -r def882d1b354 -r 5f00e9afd5d9 components/main --- a/components/main Thu May 28 03:15:43 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,87 +0,0 @@ -# Building main.lib - -OBJS="../../$INIT_blob" - -# C modules - -CFLAGS="-mn -mt -o -x -mw -me -pw2" -CPPFLAGS="-DTOOL_CHOICE=0 -D_TMS470" - -# Includes - -CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus" -CPPFLAGS="$CPPFLAGS -I.." -CPPFLAGS="$CPPFLAGS -I../config" -CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc" -CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/system" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/abb" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/armio" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/clkm" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/conf" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/dma" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/dsp_dwnld" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/inth" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/memif" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/rhea" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/security" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/spi" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/timer" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/uart" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/ulpd" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/services" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/layer1/audio_cust0" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/layer1/audio_include" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/layer1/cust0" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/layer1/hmacs" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/layer1/include" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/layer1/p_include" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/layer1/tm_include" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/layer1/tm_cust0" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/layer1/dyn_dwl_include" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/layer1/tpu_drivers/p_source0" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/layer1/tpu_drivers/source0" -CPPFLAGS="$CPPFLAGS -I$SRC/cs/layer1/tpu_drivers/source" - -SRCDIR=$SRC/cs/system/main - -cfile_plain $SRCDIR/create_RVtasks.c -cfile_plain $SRCDIR/main.c -cfile_plain $SRCDIR/sys_dummy.c - -OBJS="$OBJS ../../blobs/obj/main/mem_load.obj" - -# Assembly module - -ASMFLAGS=-me -ASMFLAGS="$ASMFLAGS -dBOARD=41" -ASMFLAGS="$ASMFLAGS -dCHIPSET=$CHIPSET" -ASMFLAGS="$ASMFLAGS -dLONG_JUMP=3" -ASMFLAGS="$ASMFLAGS -dTOOL_CHOICE=0" -ASMFLAGS="$ASMFLAGS -dR2D_ASM=0" -ASMFLAGS="$ASMFLAGS -dR2D_LCD_TEST=0" -ASMFLAGS="$ASMFLAGS -dTI_PROFILER=0" -ASMFLAGS="$ASMFLAGS -dTI_NUC_MONITOR=0" -ASMFLAGS="$ASMFLAGS -dL1_GPRS=$GPRS" -ASMFLAGS="$ASMFLAGS -dOP_WCP=0" -ASMFLAGS="$ASMFLAGS -dWCP_PROF=0" - -if [ "$TARGET" = c155 ] -then - ASMFLAGS="$ASMFLAGS -dC155_TARGET=1" -else - ASMFLAGS="$ASMFLAGS -dC155_TARGET=0" -fi - -if [ "$RF" = 12 ] -then - ASMFLAGS="$ASMFLAGS -dVCXO_26MHZ=1" -else - ASMFLAGS="$ASMFLAGS -dVCXO_26MHZ=0" -fi - -asm_file $SRCDIR/int.s diff -r def882d1b354 -r 5f00e9afd5d9 configure.sh --- a/configure.sh Thu May 28 03:15:43 2020 +0000 +++ b/configure.sh Fri May 29 02:36:39 2020 +0000 @@ -225,7 +225,6 @@ export CHIPSET DSP RF export AMR L1_DYN_DSP_DWNLD L1_VOICE_MEMO_AMR MELODY_E2 SPEECH_RECO export DISABLE_SLEEP -export INIT_blob export DSAMPLE_FULL_COLOR RVTMUX_ON_MODEM UI_CONFIG export ALLOW_CSIM_GSM SERIAL_DYNAMIC_SWITCH TR_BAUD_CONFIG export TRACEMASK_IN_FFS diff -r def882d1b354 -r 5f00e9afd5d9 targets/c11x.conf --- a/targets/c11x.conf Thu May 28 03:15:43 2020 +0000 +++ b/targets/c11x.conf Fri May 29 02:36:39 2020 +0000 @@ -1,6 +1,5 @@ LINK_SCRIPT_SRC=src/cs/system/template/gsm_ds_motc139.template MAIN_blob=blobs/patches/main-rvtmodem.lib -INIT_blob=blobs/patches/main-rvtmodem/init.obj TPUDRV_blob= FLASH_BASE_ADDR=0x10000 FLASH_SECTOR_SIZE=0x10000 diff -r def882d1b354 -r 5f00e9afd5d9 targets/c139.conf --- a/targets/c139.conf Thu May 28 03:15:43 2020 +0000 +++ b/targets/c139.conf Fri May 29 02:36:39 2020 +0000 @@ -1,6 +1,5 @@ LINK_SCRIPT_SRC=src/cs/system/template/gsm_ds_motc139.template MAIN_blob=blobs/patches/main-rvtmodem.lib -INIT_blob=blobs/patches/main-rvtmodem/init.obj TPUDRV_blob= FLASH_BASE_ADDR=0x10000 FLASH_SECTOR_SIZE=0x10000 diff -r def882d1b354 -r 5f00e9afd5d9 targets/c155.conf --- a/targets/c155.conf Thu May 28 03:15:43 2020 +0000 +++ b/targets/c155.conf Fri May 29 02:36:39 2020 +0000 @@ -1,6 +1,5 @@ LINK_SCRIPT_SRC=src/cs/system/template/gsm_ds_motc155.template MAIN_blob=blobs/patches/main-rvtmodem.lib -INIT_blob=blobs/patches/main-rvtmodem/init.obj TPUDRV_blob= FLASH_BASE_ADDR=0x20000 FLASH_SECTOR_SIZE=0x10000 diff -r def882d1b354 -r 5f00e9afd5d9 targets/fcdev3b.conf --- a/targets/fcdev3b.conf Thu May 28 03:15:43 2020 +0000 +++ b/targets/fcdev3b.conf Fri May 29 02:36:39 2020 +0000 @@ -1,7 +1,6 @@ LINK_SCRIPT_SRC=src/cs/system/template/gsm_ds_pirelli_flash.template RAM_LINK_SCRIPT_SRC=src/cs/system/template/gsm_ds_pirelli_ram.template MAIN_blob=blobs/patches/main-fchw.lib -INIT_blob=blobs/patches/main-fchw/init.obj TPUDRV_blob=blobs/libs/tpudrv.lib FLASH_BASE_ADDR=0 FLASH_SECTOR_SIZE=0x40000 diff -r def882d1b354 -r 5f00e9afd5d9 targets/gtamodem.conf --- a/targets/gtamodem.conf Thu May 28 03:15:43 2020 +0000 +++ b/targets/gtamodem.conf Fri May 29 02:36:39 2020 +0000 @@ -1,6 +1,5 @@ LINK_SCRIPT_SRC=src/cs/system/template/gsm_ds_k5a3281.template MAIN_blob=blobs/libs/main.lib -INIT_blob=blobs/obj/main/init.obj TPUDRV_blob=blobs/libs/tpudrv.lib FLASH_BASE_ADDR=0 FLASH_SECTOR_SIZE=0x10000 diff -r def882d1b354 -r 5f00e9afd5d9 targets/gtm900mgc.conf --- a/targets/gtm900mgc.conf Thu May 28 03:15:43 2020 +0000 +++ b/targets/gtm900mgc.conf Fri May 29 02:36:39 2020 +0000 @@ -1,6 +1,5 @@ LINK_SCRIPT_SRC=src/cs/system/template/gsm_ds_k5a3281.template MAIN_blob=blobs/patches/main-fchw.lib -INIT_blob=blobs/patches/main-fchw/init.obj TPUDRV_blob= FLASH_BASE_ADDR=0 FLASH_SECTOR_SIZE=0x10000 diff -r def882d1b354 -r 5f00e9afd5d9 targets/j100.conf --- a/targets/j100.conf Thu May 28 03:15:43 2020 +0000 +++ b/targets/j100.conf Fri May 29 02:36:39 2020 +0000 @@ -1,6 +1,5 @@ LINK_SCRIPT_SRC=src/cs/system/template/gsm_ds_motc139.template MAIN_blob=blobs/patches/main-rvtmodem.lib -INIT_blob=blobs/patches/main-rvtmodem/init.obj TPUDRV_blob= FLASH_BASE_ADDR=0x10000 FLASH_SECTOR_SIZE=0x10000 diff -r def882d1b354 -r 5f00e9afd5d9 targets/leonardo.conf --- a/targets/leonardo.conf Thu May 28 03:15:43 2020 +0000 +++ b/targets/leonardo.conf Fri May 29 02:36:39 2020 +0000 @@ -1,6 +1,5 @@ LINK_SCRIPT_SRC=src/cs/system/template/gsm_ds_amd8_compact.template MAIN_blob=blobs/patches/main-fchw.lib -INIT_blob=blobs/patches/main-fchw/init.obj TPUDRV_blob= FLASH_BASE_ADDR=0 FLASH_SECTOR_SIZE=0x10000 diff -r def882d1b354 -r 5f00e9afd5d9 targets/pirelli.conf --- a/targets/pirelli.conf Thu May 28 03:15:43 2020 +0000 +++ b/targets/pirelli.conf Fri May 29 02:36:39 2020 +0000 @@ -1,7 +1,6 @@ LINK_SCRIPT_SRC=src/cs/system/template/gsm_ds_pirelli_flash.template RAM_LINK_SCRIPT_SRC=src/cs/system/template/gsm_ds_pirelli_ram.template MAIN_blob=blobs/patches/main-pirelli.lib -INIT_blob=blobs/patches/main-pirelli/init.obj TPUDRV_blob= FLASH_BASE_ADDR=0 FLASH_SECTOR_SIZE=0x40000 diff -r def882d1b354 -r 5f00e9afd5d9 targets/tangomdm.conf --- a/targets/tangomdm.conf Thu May 28 03:15:43 2020 +0000 +++ b/targets/tangomdm.conf Fri May 29 02:36:39 2020 +0000 @@ -1,6 +1,5 @@ LINK_SCRIPT_SRC=src/cs/system/template/gsm_ds_amd8_compact.template MAIN_blob=blobs/patches/main-fchw.lib -INIT_blob=blobs/patches/main-fchw/init.obj TPUDRV_blob= FLASH_BASE_ADDR=0 FLASH_SECTOR_SIZE=0x10000