Skip to content

Commit

Permalink
Merge branch 'ti-linux-4.4.y' of git.ti.com:ti-linux-kernel/ti-linux-…
Browse files Browse the repository at this point in the history
…kernel into ti-rt-linux-4.4.y

TI-Feature: ti_linux_base_rt
TI-Tree: [email protected]:ti-linux-kernel/ti-linux-kernel.git
TI-Branch: ti-linux-4.4.y

* 'ti-linux-4.4.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel:
  ti_config_fragments: Map: Fix am3x rt debug entry

Signed-off-by: LCPD Auto Merger <[email protected]>
  • Loading branch information
LCPD Auto Merger committed Jun 21, 2016
2 parents 04b2470 + 817f178 commit df0875e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ti_config_fragments/defconfig_map.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ classification: SDK_Release_Defconfigs type: ti_sdk_dra7x_rt_release defconfig:
classification: SDK_Release_Defconfigs type: ti_sdk_omap2_rt_release defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg wlan.cfg omap_soc.cfg real_time.cfg systemd.cfg
classification: SDK_Release_Defconfigs type: ti_sdk_k2g_rt_release defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg keystone.cfg lpae.cfg k2g_only.cfg real_time.cfg systemd.cfg
classification: SDK_Release_Defconfigs type: ti_sdk_keystone_rt_release defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg keystone.cfg lpae.cfg real_time.cfg systemd.cfg
classification: SDK_Debug_Defconfigs type: ti_sdk_dbg_am3x_rt_release defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg wlan.cfg omap_soc.cfg am33xx_only.cfg real_time.cfg systemd.cf debug_options.cfg
classification: SDK_Debug_Defconfigs type: ti_sdk_dbg_am3x_rt_release defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg wlan.cfg omap_soc.cfg am33xx_only.cfg real_time.cfg systemd.cfg debug_options.cfg
classification: SDK_Debug_Defconfigs type: ti_sdk_dbg_am4x_rt_release defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg wlan.cfg omap_soc.cfg am43xx_only.cfg real_time.cfg systemd.cfg debug_options.cfg
classification: SDK_Debug_Defconfigs type: ti_sdk_dbg_dra7x_rt_release defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg wlan.cfg omap_soc.cfg lpae.cfg dra7_only.cfg real_time.cfg systemd.cfg debug_options.cfg
classification: SDK_Debug_Defconfigs type: ti_sdk_dbg_omap2_rt_release defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg wlan.cfg omap_soc.cfg real_time.cfg systemd.cfg debug_options.cfg
Expand Down

0 comments on commit df0875e

Please sign in to comment.