This is what I use in Marlin 1.1.4
#define LCD_LANGUAGE en
#define DISPLAY_CHARSET_HD44780 JAPANESE
#define SDSUPPORT
#define SPI_SPEED SPI_HALF_SPEED
#define SD_CHECK_AND_RETRY
#define ENCODER_PULSES_PER_STEP 4
#define ENCODER_STEPS_PER_MENU_ITEM 1
//#define REVERSE_ENCODER_DIRECTION // to change the direction of the Menu enable
#define REPRAP_DISCOUNT_SMART_CONTROLLER // CL: Stock HICi3 20x4 LCD controller
#define NEWPANEL // enable this if you have a click-encoder panel
#define LCD_LANGUAGE en
#define DISPLAY_CHARSET_HD44780 JAPANESE
#define SDSUPPORT
#define SPI_SPEED SPI_HALF_SPEED
#define SD_CHECK_AND_RETRY
#define ENCODER_PULSES_PER_STEP 4
#define ENCODER_STEPS_PER_MENU_ITEM 1
//#define REVERSE_ENCODER_DIRECTION // to change the direction of the Menu enable
#define REPRAP_DISCOUNT_SMART_CONTROLLER // CL: Stock HICi3 20x4 LCD controller
#define NEWPANEL // enable this if you have a click-encoder panel