summaryrefslogtreecommitdiff
path: root/keyboard/hhkb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboard/hhkb')
-rw-r--r--keyboard/hhkb/Makefile17
-rw-r--r--keyboard/hhkb/ld_keymap_avr5.x268
2 files changed, 7 insertions, 278 deletions
diff --git a/keyboard/hhkb/Makefile b/keyboard/hhkb/Makefile
index 3422193721..34bafc24fc 100644
--- a/keyboard/hhkb/Makefile
+++ b/keyboard/hhkb/Makefile
@@ -111,18 +111,15 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options
# comment out to disable the options.
#
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # USB Nkey Rollover
+BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = yes # Console for debug
+COMMAND_ENABLE = yes # Commands for debug and configuration
+NKRO_ENABLE = yes # USB Nkey Rollover
+KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor
-# keymap section
-EXTRALDFLAGS = -Wl,-Tld_keymap_avr5.x
-OPT_DEFS += -DKEYMAP_SECTION
-
# Search Path
VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)
diff --git a/keyboard/hhkb/ld_keymap_avr5.x b/keyboard/hhkb/ld_keymap_avr5.x
deleted file mode 100644
index c09693e514..0000000000
--- a/keyboard/hhkb/ld_keymap_avr5.x
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * linker script for configurable keymap
- *
- * This adds keymap section which places keymap at fixed address and
- * is based on binutils-avr ldscripts(/usr/lib/ldscripts/avr5.x).
- */
-OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr")
-OUTPUT_ARCH(avr:5)
-MEMORY
-{
- /* With keymap section
- *
- * Flash Map of ATMega32U4(32KB)
- * +------------+ 0x0000
- * | .vectors |
- * | .progmem |
- * | .init0-9 | > text region
- * | .text |
- * | .fini9-0 |
- * | |
- * |------------| _etext
- * | .data |
- * | .bss | > data region
- * | .noinit |
- * | |
- * |------------| 0x6800
- * | .keymap | > keymap region(2KB)
- * |------------| 0x7000
- * | bootloader | 4KB
- * +------------+ 0x7FFF
- */
- text (rx) : ORIGIN = 0, LENGTH = 128K
- keymap (rw!x) : ORIGIN = 0x6800, LENGTH = 2K
- data (rw!x) : ORIGIN = 0x800060, LENGTH = 0xffa0
- eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K
- fuse (rw!x) : ORIGIN = 0x820000, LENGTH = 1K
- lock (rw!x) : ORIGIN = 0x830000, LENGTH = 1K
- signature (rw!x) : ORIGIN = 0x840000, LENGTH = 1K
-}
-SECTIONS
-{
- /* Read-only sections, merged into text segment: */
- .hash : { *(.hash) }
- .dynsym : { *(.dynsym) }
- .dynstr : { *(.dynstr) }
- .gnu.version : { *(.gnu.version) }
- .gnu.version_d : { *(.gnu.version_d) }
- .gnu.version_r : { *(.gnu.version_r) }
- .rel.init : { *(.rel.init) }
- .rela.init : { *(.rela.init) }
- .rel.text :
- {
- *(.rel.text)
- *(.rel.text.*)
- *(.rel.gnu.linkonce.t*)
- }
- .rela.text :
- {
- *(.rela.text)
- *(.rela.text.*)
- *(.rela.gnu.linkonce.t*)
- }
- .rel.fini : { *(.rel.fini) }
- .rela.fini : { *(.rela.fini) }
- .rel.rodata :
- {
- *(.rel.rodata)
- *(.rel.rodata.*)
- *(.rel.gnu.linkonce.r*)
- }
- .rela.rodata :
- {
- *(.rela.rodata)
- *(.rela.rodata.*)
- *(.rela.gnu.linkonce.r*)
- }
- .rel.data :
- {
- *(.rel.data)
- *(.rel.data.*)
- *(.rel.gnu.linkonce.d*)
- }
- .rela.data :
- {
- *(.rela.data)
- *(.rela.data.*)
- *(.rela.gnu.linkonce.d*)
- }
- .rel.ctors : { *(.rel.ctors) }
- .rela.ctors : { *(.rela.ctors) }
- .rel.dtors : { *(.rel.dtors) }
- .rela.dtors : { *(.rela.dtors) }
- .rel.got : { *(.rel.got) }
- .rela.got : { *(.rela.got) }
- .rel.bss : { *(.rel.bss) }
- .rela.bss : { *(.rela.bss) }
- .rel.plt : { *(.rel.plt) }
- .rela.plt : { *(.rela.plt) }
- /* Internal text space or external memory. */
- .text :
- {
- *(.vectors)
- KEEP(*(.vectors))
- /* For data that needs to reside in the lower 64k of progmem. */
- *(.progmem.gcc*)
- *(.progmem*)
- . = ALIGN(2);
- __trampolines_start = . ;
- /* The jump trampolines for the 16-bit limited relocs will reside here. */
- *(.trampolines)
- *(.trampolines*)
- __trampolines_end = . ;
- /* For future tablejump instruction arrays for 3 byte pc devices.
- We don't relax jump/call instructions within these sections. */
- *(.jumptables)
- *(.jumptables*)
- /* For code that needs to reside in the lower 128k progmem. */
- *(.lowtext)
- *(.lowtext*)
- __ctors_start = . ;
- *(.ctors)
- __ctors_end = . ;
- __dtors_start = . ;
- *(.dtors)
- __dtors_end = . ;
- KEEP(SORT(*)(.ctors))
- KEEP(SORT(*)(.dtors))
- /* From this point on, we don't bother about wether the insns are
- below or above the 16 bits boundary. */
- *(.init0) /* Start here after reset. */
- KEEP (*(.init0))
- *(.init1)
- KEEP (*(.init1))
- *(.init2) /* Clear __zero_reg__, set up stack pointer. */
- KEEP (*(.init2))
- *(.init3)
- KEEP (*(.init3))
- *(.init4) /* Initialize data and BSS. */
- KEEP (*(.init4))
- *(.init5)
- KEEP (*(.init5))
- *(.init6) /* C++ constructors. */
- KEEP (*(.init6))
- *(.init7)
- KEEP (*(.init7))
- *(.init8)
- KEEP (*(.init8))
- *(.init9) /* Call main(). */
- KEEP (*(.init9))
- *(.text)
- . = ALIGN(2);
- *(.text.*)
- . = ALIGN(2);
- *(.fini9) /* _exit() starts here. */
- KEEP (*(.fini9))
- *(.fini8)
- KEEP (*(.fini8))
- *(.fini7)
- KEEP (*(.fini7))
- *(.fini6) /* C++ destructors. */
- KEEP (*(.fini6))
- *(.fini5)
- KEEP (*(.fini5))
- *(.fini4)
- KEEP (*(.fini4))
- *(.fini3)
- KEEP (*(.fini3))
- *(.fini2)
- KEEP (*(.fini2))
- *(.fini1)
- KEEP (*(.fini1))
- *(.fini0) /* Infinite loop after program termination. */
- KEEP (*(.fini0))
- _etext = . ;
- } > text
- .data : AT (ADDR (.text) + SIZEOF (.text))
- {
- PROVIDE (__data_start = .) ;
- *(.data)
- *(.data*)
- *(.rodata) /* We need to include .rodata here if gcc is used */
- *(.rodata*) /* with -fdata-sections. */
- *(.gnu.linkonce.d*)
- . = ALIGN(2);
- _edata = . ;
- PROVIDE (__data_end = .) ;
- } > data
- .bss : AT (ADDR (.bss))
- {
- PROVIDE (__bss_start = .) ;
- *(.bss)
- *(.bss*)
- *(COMMON)
- PROVIDE (__bss_end = .) ;
- } > data
- __data_load_start = LOADADDR(.data);
- __data_load_end = __data_load_start + SIZEOF(.data);
- /* Global data not cleared after reset. */
- .noinit :
- {
- PROVIDE (__noinit_start = .) ;
- *(.noinit*)
- PROVIDE (__noinit_end = .) ;
- _end = . ;
- PROVIDE (__heap_start = .) ;
- } > data
- /* keymap region is located at end of flash
- * .fn_actions Fn actions definitions
- * .keymaps Mapping layers
- */
- .keymap :
- {
- PROVIDE(__keymap_start = .) ;
- *(.keymap.fn_actions) /* 32*actions = 64bytes */
- . = ALIGN(0x40);
- *(.keymap.keymaps) /* rest of .keymap section */
- *(.keymap*)
- /* . = ALIGN(0x800); */ /* keymap section takes 2KB- */
- } > keymap = 0x00 /* zero fill */
- .eeprom :
- {
- *(.eeprom*)
- __eeprom_end = . ;
- } > eeprom
- .fuse :
- {
- KEEP(*(.fuse))
- KEEP(*(.lfuse))
- KEEP(*(.hfuse))
- KEEP(*(.efuse))
- } > fuse
- .lock :
- {
- KEEP(*(.lock*))
- } > lock
- .signature :
- {
- KEEP(*(.signature*))
- } > signature
- /* Stabs debugging sections. */
- .stab 0 : { *(.stab) }
- .stabstr 0 : { *(.stabstr) }
- .stab.excl 0 : { *(.stab.excl) }
- .stab.exclstr 0 : { *(.stab.exclstr) }
- .stab.index 0 : { *(.stab.index) }
- .stab.indexstr 0 : { *(.stab.indexstr) }
- .comment 0 : { *(.comment) }
- /* DWARF debug sections.
- Symbols in the DWARF debugging sections are relative to the beginning
- of the section so we begin them at 0. */
- /* DWARF 1 */
- .debug 0 : { *(.debug) }
- .line 0 : { *(.line) }
- /* GNU DWARF 1 extensions */
- .debug_srcinfo 0 : { *(.debug_srcinfo) }
- .debug_sfnames 0 : { *(.debug_sfnames) }
- /* DWARF 1.1 and DWARF 2 */
- .debug_aranges 0 : { *(.debug_aranges) }
- .debug_pubnames 0 : { *(.debug_pubnames) }
- /* DWARF 2 */
- .debug_info 0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
- .debug_abbrev 0 : { *(.debug_abbrev) }
- .debug_line 0 : { *(.debug_line) }
- .debug_frame 0 : { *(.debug_frame) }
- .debug_str 0 : { *(.debug_str) }
- .debug_loc 0 : { *(.debug_loc) }
- .debug_macinfo 0 : { *(.debug_macinfo) }
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 21:56:46 +0000