Changeset 6f793108 in rtems


Ignore:
Timestamp:
May 23, 2015, 5:32:35 PM (4 years ago)
Author:
Jan Dolezal <dolezj21@…>
Branches:
4.11, master
Children:
5b1a10a
Parents:
56399c3b
git-author:
Jan Dolezal <dolezj21@…> (05/23/15 17:32:35)
git-committer:
Joel Sherrill <joel.sherrill@…> (05/26/15 16:26:54)
Message:

i386/pc386: default graphics driver changed from VGA to VESA based

basic VGA driver can be enabled during configure phase by exporting variable
USE_VGA=1 so that it is available in configure environment
cirrus driver is enabled the same way by exporting variable
USE_CIRRUS_GD5446=1

Location:
c/src/lib/libbsp/i386/pc386
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/i386/pc386/Makefile.am

    r56399c3b r6f793108  
    9898libbsp_a_SOURCES += console/vgacons.c
    9999include_bsp_HEADERS += console/fb_default_mode.h
     100if USE_VGA
     101libbsp_a_SOURCES += console/fb_vga.c
     102endif
     103if USE_CIRRUS_GD5446
     104libbsp_a_SOURCES += console/fb_cirrus.c
     105endif
    100106if USE_VBE_RM
    101107include_bsp_HEADERS += include/vbe3.h
     
    103109include_bsp_HEADERS += include/fb_vesa.h
    104110libbsp_a_SOURCES += console/fb_vesa_rm.c
    105 else
    106 if USE_CIRRUS_GD5446
    107 libbsp_a_SOURCES += console/fb_cirrus.c
    108 else
    109 libbsp_a_SOURCES += console/fb_vga.c
    110 endif
    111111endif
    112112endif
  • c/src/lib/libbsp/i386/pc386/configure.ac

    r56399c3b r6f793108  
    100100])
    101101
    102 RTEMS_BSPOPTS_SET([USE_CIRRUS_GD5446],[*],[0])
    103 RTEMS_BSPOPTS_HELP([USE_CIRRUS_GD5446],
    104 [If defined, enable use of the Cirrus GD5446 controller rather than the very basic
    105  VGA driver for frame buffer support.
    106 
    107  NOTE: This has only been tested on Qemu.])
    108 AM_CONDITIONAL(USE_CIRRUS_GD5446,test "$USE_CIRRUS_GD5446" = "1")
    109 
    110 RTEMS_BSPOPTS_SET([USE_VBE_RM],[*],[0])
    111 RTEMS_BSPOPTS_HELP([USE_VBE_RM],
    112 [If defined, enables use of the Vesa Bios Extensions - real mode interface,
    113  which enables graphical mode and introduce it upon bootup.])
    114 AM_CONDITIONAL(USE_VBE_RM,test "$USE_VBE_RM" = "1")
    115 
    116 if test "${USE_VBE_RM}" = "1" ; then
     102if test "${USE_CIRRUS_GD5446}" != "1" -a "${USE_VGA}" != "1"; then
     103  USE_VBE_RM=1;
    117104  if test -z "${NUM_APP_DRV_GDT_DESCRIPTORS}"; then
    118105      NUM_APP_DRV_GDT_DESCRIPTORS=2 ;
     
    125112[Defines how many descriptors in GDT may be allocated for application or
    126113 driver usage.])
     114
     115RTEMS_BSPOPTS_SET([USE_CIRRUS_GD5446],[*],[0])
     116RTEMS_BSPOPTS_HELP([USE_CIRRUS_GD5446],
     117[If defined, enables use of the Cirrus GD5446 controller rather than the
     118 controller utilizing Vesa Bios Extensions - real mode interface.
     119
     120 NOTE: This has only been tested on Qemu.])
     121AM_CONDITIONAL(USE_CIRRUS_GD5446,test "$USE_CIRRUS_GD5446" = "1")
     122
     123RTEMS_BSPOPTS_SET([USE_VGA],[*],[0])
     124RTEMS_BSPOPTS_HELP([USE_VGA],
     125[If defined, enables use of the very basic VGA driver for framebuffer support
     126 rather than the controller utilizing Vesa Bios Extensions - real mode
     127 interface.])
     128AM_CONDITIONAL(USE_VGA,test "$USE_VGA" = "1")
     129
     130RTEMS_BSPOPTS_SET([USE_VBE_RM],[*],[0])
     131RTEMS_BSPOPTS_HELP([USE_VBE_RM],
     132[Defined by default. Enables use of the Vesa Bios Extensions - real mode
     133 interface, which enables graphical mode and introduce it upon bootup.])
     134AM_CONDITIONAL(USE_VBE_RM,test "$USE_VBE_RM" = "1")
    127135
    128136if test X${CLOCK_DRIVER_USE_TSC} = X1 -a X${CLOCK_DRIVER_USE_8254} = X1 ; then
  • c/src/lib/libbsp/i386/pc386/preinstall.am

    r56399c3b r6f793108  
    157157        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/fb_vesa.h
    158158PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/fb_vesa.h
    159 
    160 else
    161159endif
    162160endif
Note: See TracChangeset for help on using the changeset viewer.