Changeset d085df10 in mainline for HelenOS.config


Ignore:
Timestamp:
2012-09-23T16:19:26Z (13 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
21aab25
Parents:
47d2ca9 (diff), 40ad375 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge changes from the beagleboard-xm branch

File:
1 edited

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    r47d2ca9 rd085df10  
    615615@ "efi" GRUB for UEFI
    616616! [PLATFORM=ia32|PLATFORM=amd64] GRUB_ARCH (choice)
     617
     618% uImage OS type
     619@ "2" NetBSD stage 2 boot loader
     620! [PLATFORM=arm32&MACHINE=beagleboardxm] UIMAGE_OS (choice)
     621
     622% uImage OS type
     623@ "5" Linux kernel
     624! [PLATFORM=arm32&MACHINE!=beagleboardxm] UIMAGE_OS (choice)
Note: See TracChangeset for help on using the changeset viewer.