Cannot straightforwardly derive symbols conditionally from multiple sources in CML2

Ternary expressions on derive statements cause type errors (CML2 Bug?).
	modified:   config/cml/arm.cml
	modified:   scripts/conts/generate_kernel_cinfo.py
This commit is contained in:
Bahadir Balban
2009-09-23 12:57:43 +03:00
parent 041190b5f2
commit 9bd265c7ec
2 changed files with 38 additions and 4 deletions

View File

@@ -335,10 +335,16 @@ when CONFIG_CONT0_TYPE_BARE==y suppress cont0_linux_pager_params
when CONFIG_CONT1_TYPE_LINUX==y suppress cont1_bare_pager_params
when CONFIG_CONT1_TYPE_BARE==y suppress cont1_linux_pager_params
derive CONFIG_CONT0_PAGER_LMA__ from CONFIG_CONT0_LINUX_PHYS_OFFSET + CONFIG_CONT0_LINUX_TEXT_OFFSET
derive CONFIG_CONT0_PAGER_VMA__ from CONFIG_CONT0_LINUX_PAGE_OFFSET
derive CONFIG_CONT0_LINUX_LMA____ from CONFIG_CONT0_LINUX_PHYS_OFFSET + CONFIG_CONT0_LINUX_TEXT_OFFSET
derive CONFIG_CONT0_PAGER_LMA__ from ((CONFIG_CONT0_TYPE_LINUX==y) ? CONFIG_CONT0_LINUX_LMA____ : CONFIG_CONT0_PAGER_LMA)
#derive CONFIG_CONT0_PAGER_VMA__ from CONFIG_CONT0_LINUX_PAGE_OFFSET
#derive CONFIG_CONT0_PAGER_LMA__ from CONFIG_CONT0_PAGER_LMA
#derive CONFIG_CONT0_PAGER_VMA__ from CONFIG_CONT0_LINUX_VMA
#derive CONFIG_CONT0_PAGER_VMA__ from CONFIG_CONT0_PAGER_VMA
derive CONFIG_CONT1_PAGER_LMA__ from CONFIG_CONT1_PAGER_LMA
derive CONFIG_CONT1_PAGER_VMA__ from CONFIG_CONT1_PAGER_VMA
#derive CONFIG_CONT1_PAGER_LMA__ from CONFIG_CONT1_LINUX_PHYS_OFFSET + CONFIG_CONT1_LINUX_TEXT_OFFSET
#derive CONFIG_CONT1_PAGER_VMA__ from CONFIG_CONT1_LINUX_PAGE_OFFSET
symbols
containers_menu 'Configure Containers'