diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-29 05:13:22 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-29 05:13:22 +0200 |
| commit | 9a91d51f24b366181d1a953c84232871125c6666 (patch) | |
| tree | a1bb1400683406ed20cb9177698ec6c91ff6ad27 /target/linux/config | |
| parent | a3f13b147ab6e48be91dedbe116411196f1448b0 (diff) | |
| parent | 83b06f4f07ae26ef02fd909f18288f43ed4c3c29 (diff) | |
resolve conflict
Diffstat (limited to 'target/linux/config')
| -rw-r--r-- | target/linux/config/Config.in.systems | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/target/linux/config/Config.in.systems b/target/linux/config/Config.in.systems index 8750ac281..369727277 100644 --- a/target/linux/config/Config.in.systems +++ b/target/linux/config/Config.in.systems @@ -1,3 +1,10 @@ +# page size +config ADK_KERNEL_PAGE_SIZE_4KB + boolean + +config ADK_KERNEL_PAGE_SIZE_16KB + boolean + # mips systems config ADK_KERNEL_ATHEROS_AR231X boolean @@ -37,6 +44,7 @@ config ADK_KERNEL_ARCH_AT91SAM9G20 config ADK_KERNEL_MACH_ACMENETUSFOXG20 boolean +# endianesss and ABI config ADK_KERNEL_AEABI boolean |